tests/test-merge-symlinks.out
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
Wed, 11 Nov 2009 17:48:00 +0100
changeset 9876 6e8a16dd3e30
parent 5408 36794dbe66a3
permissions -rw-r--r--
alias: improve help text for command aliases Displays the line "alias for: hg ..." with the original command including options, followed by the command's original help text.

3 files updated, 0 files merged, 0 files removed, 0 files unresolved
% merge heads
HG_FILE l
HG_MY_ISLINK 1
HG_OTHER_ISLINK 0
HG_BASE_ISLINK 0
merging l
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% merge working directory
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
HG_FILE l2
HG_MY_ISLINK 1
HG_OTHER_ISLINK 0
HG_BASE_ISLINK 0
merging l2
0 files updated, 1 files merged, 0 files removed, 0 files unresolved