Mercurial > hg
view tests/test-diff-copy-depth @ 12045:1e8c7999af86
Fix merge-tools.checkconflicts
re.match only looks at the beginning of the merged file, and without
re.MULTILINE the file had to end with ">>>>>>> something".
Now conflict markers inside the file are found, too.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 26 Aug 2010 17:38:43 +0200 |
parents | 204a2ca249b6 |
children |
line wrap: on
line source
#!/bin/sh for i in aaa zzz; do hg init t cd t echo "-- With $i" touch file hg add file hg ci -m "Add" hg cp file $i hg ci -m "a -> $i" hg cp $i other-file echo "different" >> $i hg ci -m "$i -> other-file" hg cp other-file somename echo "Status": hg st -C echo echo "Diff:" hg diff -g echo cd .. rm -rf t done