Mercurial > hg
view tests/test-resolve @ 9462:1f54b1b7122f
test-keyword: run kwdemo before setting up [keyword] files
kwdemo would pass the test without uisetup otherwise.
Also no need to specify --default option.
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Thu, 10 Sep 2009 23:15:37 +0200 |
parents | 6c82beaaa11a |
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