Tue, 24 May 2005 23:34:06 -0800 Pass filename to $HGMERGE
mpm@selenic.com [Tue, 24 May 2005 23:34:06 -0800] rev 149
Pass filename to $HGMERGE This lets the merge program be slightly more user-friendly
(0) -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 tip