author | timeless <timeless@mozdev.org> |
Tue, 23 Feb 2010 06:42:10 +0100 | |
branch | stable |
changeset 10527 | 9c0ba837dc65 |
parent 8167 | 6c82beaaa11a |
child 11451 | 51021f4c80b5 |
permissions | -rwxr-xr-x |
#!/bin/sh # test that a commit clears the merge state. hg init repo cd repo echo foo > file hg commit -Am 'add file' echo bar >> file hg commit -Am 'append bar' echo % create a second head hg up -C 0 echo baz >> file hg commit -Am 'append baz' echo % failing merge HGMERGE=internal:fail hg merge echo resolved > file hg resolve -m file hg commit -m 'resolved' echo % resolve -l, should be empty hg resolve -l