tests/test-merge6.out
author mpm@selenic.com
Wed, 17 Aug 2005 12:22:12 -0800
changeset 935 925563ff1b18
parent 925 5a034646e472
child 990 5007e0bdeed2
permissions -rw-r--r--
bash: Add smarter completion of add/commit/remove/forget/diff/revert Use hg status to determine which files are interesting for various commands. Thus, hg add [tab] finds unknown files, and hg commit [tab] finds added, modified, or removed files.

pulling from ../B1
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
bar should remain deleted.
6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo
pulling from ../A2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files
(run 'hg update' to get a working copy)
bar should remain deleted.
6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo