# HG changeset patch
# User Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
# Date 1140714604 -3600
# Node ID d610fe0e689389a8bb69e559ac1d960bb6783a05
# Parent  42f75cd04bf43feac1ded519c331af461eb67b2d
hgmerge: do not use file with markers in tools merging themselves

This time I forgot about a crucial part of the logic change.
The patch makes kdiff3 and tkdiff useful again.



diff -r 42f75cd04bf4 -r d610fe0e6893 hgmerge
--- a/hgmerge	Thu Feb 23 14:42:47 2006 +0100
+++ b/hgmerge	Thu Feb 23 18:10:04 2006 +0100
@@ -118,13 +118,13 @@
 if [ -n "$DISPLAY" ]; then
     # try using kdiff3, which is fairly nice
     if [ -n "$KDIFF3" ]; then
-        $KDIFF3 --auto "$BASE" "$LOCAL" "$OTHER" -o "$LOCAL" || failure
+        $KDIFF3 --auto "$BASE" "$BACKUP" "$OTHER" -o "$LOCAL" || failure
         success
     fi
 
     # try using tkdiff, which is a bit less sophisticated
     if [ -n "$TKDIFF" ]; then
-        $TKDIFF "$LOCAL" "$OTHER" -a "$BASE" -o "$LOCAL" || failure
+        $TKDIFF "$BACKUP" "$OTHER" -a "$BASE" -o "$LOCAL" || failure
         success
     fi