Mercurial > hg
comparison tests/test-imerge @ 6363:bbfebf751ac8
test-imerge: test resolve subcommand
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 23 Mar 2008 20:37:04 +0100 |
parents | bc3dbdb1d430 |
children |
comparison
equal
deleted
inserted
replaced
6362:bc3dbdb1d430 | 6363:bbfebf751ac8 |
---|---|
30 echo % status -v | 30 echo % status -v |
31 hg -v imerge st | 31 hg -v imerge st |
32 | 32 |
33 echo % next | 33 echo % next |
34 hg imerge next | 34 hg imerge next |
35 | |
36 echo % resolve and unresolve | |
37 hg imerge resolve foo | |
38 hg -v imerge st | |
39 hg imerge unresolve foo | |
40 hg -v imerge st | |
35 | 41 |
36 echo % merge next | 42 echo % merge next |
37 hg --traceback imerge | 43 hg --traceback imerge |
38 | 44 |
39 echo % unresolve | 45 echo % unresolve |