Mercurial > hg

diff 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
line wrap: on
line diff
--- a/tests/test-imerge	Sun Mar 23 18:52:02 2008 +0100
+++ b/tests/test-imerge	Sun Mar 23 20:37:02 2008 +0100
@@ -46,6 +46,11 @@
 echo foo > foo2
 hg imerge save ../savedmerge
 
+echo % merge auto
+hg up -C 1
+hg --traceback imerge --auto
+cat foo2
+
 echo % load
 hg up -C 0
 hg imerge --traceback load ../savedmerge