Mercurial > hg-stable
view tests/test-resolve @ 8167:6c82beaaa11a
tests: removed redundant "-d '0 0'" from test scripts
The tests are executed with a .hgrc file which adds "-d '0 0'" by
default.
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sun, 26 Apr 2009 14:29:02 +0200 |
parents | 9f73bddb9d0b |
children | 51021f4c80b5 |
line wrap: on
line source
#!/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