Mercurial > hg
comparison tests/test-rebase-mq.out @ 11203:7a9cf012dddc
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 | 92342fa9fbd8 |
comparison
equal
deleted
inserted
replaced
11202:f974fe896921 | 11203:7a9cf012dddc |
---|---|
26 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue | 26 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue |
27 merging f | 27 merging f |
28 | 28 |
29 % Fix the 2nd conflict | 29 % Fix the 2nd conflict |
30 saved backup bundle to | 30 saved backup bundle to |
31 rebase completed | |
32 @ 3 P1 tags: f2.patch qtip tip | 31 @ 3 P1 tags: f2.patch qtip tip |
33 | | 32 | |
34 o 2 P0 tags: f.patch qbase | 33 o 2 P0 tags: f.patch qbase |
35 | | 34 | |
36 o 1 R1 tags: qparent | 35 o 1 R1 tags: qparent |