Mercurial > hg-stable

comparison hgmerge @ 1798:d610fe0e6893

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
1797:42f75cd04bf4 1798:d610fe0e6893
116 fi 116 fi
117 117
118 if [ -n "$DISPLAY" ]; then 118 if [ -n "$DISPLAY" ]; then
119 # try using kdiff3, which is fairly nice 119 # try using kdiff3, which is fairly nice
120 if [ -n "$KDIFF3" ]; then 120 if [ -n "$KDIFF3" ]; then
121 $KDIFF3 --auto "$BASE" "$LOCAL" "$OTHER" -o "$LOCAL" || failure 121 $KDIFF3 --auto "$BASE" "$BACKUP" "$OTHER" -o "$LOCAL" || failure
122 success 122 success
123 fi 123 fi
124 124
125 # try using tkdiff, which is a bit less sophisticated 125 # try using tkdiff, which is a bit less sophisticated
126 if [ -n "$TKDIFF" ]; then 126 if [ -n "$TKDIFF" ]; then
127 $TKDIFF "$LOCAL" "$OTHER" -a "$BASE" -o "$LOCAL" || failure 127 $TKDIFF "$BACKUP" "$OTHER" -a "$BASE" -o "$LOCAL" || failure
128 success 128 success
129 fi 129 fi
130 130
131 if [ -n "$MELD" ]; then 131 if [ -n "$MELD" ]; then
132 cp "$BACKUP" "$CHGTEST" 132 cp "$BACKUP" "$CHGTEST"