Mercurial > hg

comparison tests/test-rebase-conflicts.out @ 11203:7a9cf012dddc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: only show "rebase completed" message with -v
author Matt Mackall <mpm@selenic.com>
date Thu, 20 May 2010 15:15:11 -0500
parents f974fe896921
children
comparison
equal deleted inserted replaced
11202:f974fe896921 11203:7a9cf012dddc
25 % Try to continue without solving the conflict 25 % Try to continue without solving the conflict
26 abort: unresolved merge conflicts (see hg resolve) 26 abort: unresolved merge conflicts (see hg resolve)
27 27
28 % Conclude rebase 28 % Conclude rebase
29 saved backup bundle to 29 saved backup bundle to
30 rebase completed
31 @ 5: L3 30 @ 5: L3
32 | 31 |
33 o 4: L2 32 o 4: L2
34 | 33 |
35 o 3: L1 34 o 3: L1