Mercurial > hg
view tests/test-rebase-conflicts.out @ 7117:ceb8aef03aa7
Document email.charsets in hgrc.5
hgrc.5.ja.txt probably should include an example like:
[email]
charsets = iso-8859-1, iso-8859-15, windows-1252, iso-8859-2,
windows-1250, iso-2022-jp, iso-2022-jp-ms
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Thu, 16 Oct 2008 17:08:46 +0200 |
parents | 808f03f61ebe |
children | 45495d784ad6 |
line wrap: on
line source
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 % Try to call --continue abort: no rebase in progress % Conflicting rebase merging common warning: conflicts during merge. merging common failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue % Try to continue without solving the conflict abort: unresolved merge conflicts (see hg resolve) % Conclude rebase saving bundle to adding branch adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files rebase completed @ 4: L2 | o 3: L1 | o 2: C3 | o 1: C2 | o 0: C1