Mercurial > hg
view tests/test-resolve @ 10512:261cc6b0f15c
Merge with stable
author | Steve Borho <steve@borho.org> |
---|---|
date | Thu, 18 Feb 2010 23:23:17 -0600 |
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