Mercurial > hg
comparison tests/test-merge-tools.t @ 21693:9c35f3a8cac4
merge: drop the quotes around commit description
We already have a ":" after the user name to denote the start of the
description. The current usage of quotes around the description is
problematic as the truncation to 80 chars is likely to drop the
closing quote. This may confuse syntax coloration in some editors.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Mon, 26 May 2014 11:44:58 -0700 |
| parents | 61151f429a5f |
| children | f28329171a86 |
comparison
equal
deleted
inserted
replaced
| 21692:5b2a2bea8cb6 | 21693:9c35f3a8cac4 |
|---|---|
| 64 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 64 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 65 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 65 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 66 [1] | 66 [1] |
| 67 $ aftermerge | 67 $ aftermerge |
| 68 # cat f | 68 # cat f |
| 69 <<<<<<< local: ef83787e2614 - test: "revision 1" | 69 <<<<<<< local: ef83787e2614 - test: revision 1 |
| 70 revision 1 | 70 revision 1 |
| 71 ======= | 71 ======= |
| 72 revision 2 | 72 revision 2 |
| 73 >>>>>>> other: 0185f4e0cf02 - test: "revision 2" | 73 >>>>>>> other: 0185f4e0cf02 - test: revision 2 |
| 74 space | 74 space |
| 75 # hg stat | 75 # hg stat |
| 76 M f | 76 M f |
| 77 ? f.orig | 77 ? f.orig |
| 78 | 78 |