Module Name:	pkgsrc
Committed By:	drochner
Date:		Tue Mar 14 13:56:12 UTC 2006

Modified Files:
	pkgsrc/devel/mercurial: Makefile distinfo
Added Files:
	pkgsrc/devel/mercurial/patches: patch-aa

Log Message:
remove a bashism ("select") in the merge script
(this is quite invasive: it disables "FileMerge.app" on MacOS)
bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -r1.5 -r1.6 pkgsrc/devel/mercurial/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/devel/mercurial/distinfo
cvs rdiff -r0 -r1.1 pkgsrc/devel/mercurial/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.