Mercurial > hg-stable

comparison tests/test-imerge @ 6362:bc3dbdb1d430

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
imerge: replace "merge" with "internal:merge" when non-interactive
author Patrick Mezard <pmezard@gmail.com>
date Sun, 23 Mar 2008 20:37:02 +0100
parents 5c5e45766224
children bbfebf751ac8
comparison
equal deleted inserted replaced
6361:9b21faa6f013 6362:bc3dbdb1d430
44 44
45 echo % save 45 echo % save
46 echo foo > foo2 46 echo foo > foo2
47 hg imerge save ../savedmerge 47 hg imerge save ../savedmerge
48 48
49 echo % merge auto
50 hg up -C 1
51 hg --traceback imerge --auto
52 cat foo2
53
49 echo % load 54 echo % load
50 hg up -C 0 55 hg up -C 0
51 hg imerge --traceback load ../savedmerge 56 hg imerge --traceback load ../savedmerge
52 cat foo2 57 cat foo2
53 58