Mercurial > hg
comparison tests/test-histedit-non-commute-abort.t @ 28004:34165875fa5d
histedit: limit updated and merging output to important updates
Output is retained when:
* There's a conflict
* User asked to edit
* User aborts
otherwise, output is suppressed
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Wed, 03 Feb 2016 13:52:04 +0000 |
| parents | e7ff83b2bcfe |
| children | 8abd9f785030 |
comparison
equal
deleted
inserted
replaced
| 28003:a1d4ca0c8483 | 28004:34165875fa5d |
|---|---|
| 67 > pick 055a42cdd887 d | 67 > pick 055a42cdd887 d |
| 68 > pick bfa474341cc9 does not commute with e | 68 > pick bfa474341cc9 does not commute with e |
| 69 > pick e860deea161a e | 69 > pick e860deea161a e |
| 70 > pick 652413bf663e f | 70 > pick 652413bf663e f |
| 71 > EOF | 71 > EOF |
| 72 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
| 73 merging e | 72 merging e |
| 74 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') | 73 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
| 75 Fix up the change (pick e860deea161a) | 74 Fix up the change (pick e860deea161a) |
| 76 (hg histedit --continue to resume) | 75 (hg histedit --continue to resume) |
| 77 | 76 |