Mercurial > hg
diff hgmerge @ 1798:d610fe0e6893
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.
author | Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
---|---|
date | Thu, 23 Feb 2006 18:10:04 +0100 |
parents | 42f75cd04bf4 |
children | 05c7d75be925 |
line wrap: on
line diff
--- 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