tests/test-rebase-abort.out
author Martin Geisler <mg@daimi.au.dk>
Tue, 09 Sep 2008 21:32:39 +0200
changeset 7013 f56e788fa292
parent 6906 808f03f61ebe
child 11198 b345b1cc124f
permissions -rw-r--r--
i18n: mark help strings for translation The gettext function is just another name for the normal _ function and it is used for translating docstrings when using _ would make pygettext.py output a warning.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
@  4: L2
|
o  3: L1
|
| o  2: C3
|/
o  1: C2
|
o  0: C1


% Conflicting rebase
merging common
warning: conflicts during merge.
merging common failed!
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue

% Abort
rebase aborted
@  4: L2
|
o  3: L1
|
| o  2: C3
|/
o  1: C2
|
o  0: C1