Mercurial > hg

diff tests/test-rebase-abort.out @ 6906:808f03f61ebe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add rebase extension
author Stefano Tortarolo <stefano.tortarolo@gmail.com>
date Mon, 18 Aug 2008 21:16:31 +0200
parents
children b345b1cc124f
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-rebase-abort.out	Mon Aug 18 21:16:31 2008 +0200
@@ -0,0 +1,31 @@
+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
+