Mercurial > hg
view tests/test-revert-unknown @ 12046:8e7960feb139 stable
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 | 890e285c52a1 |
children |
line wrap: on
line source
#!/bin/sh hg init touch unknown touch a hg add a hg ci -m "1" -d "1000000 0" touch b hg add b hg ci -m "2" -d "1000000 0" echo %% Should show unknown hg status hg revert -r 0 --all echo %% Should show unknown and b removed hg status echo %% Should show a and unknown ls