Mercurial > hg
comparison tests/test-merge7.t @ 30460:ce3a133f71b3
conflicts: make spacing consistent in conflict markers
The way default marker template was defined before this patch,
the spacing before dash in conflict markes was dependent on
whether changeset is a tip one or not. This is a relevant part
of template:
'{ifeq(tags, "tip", "", "{tags} "}'
If revision is a tip revision with no other tags, this would
resolve to an empty string, but for revisions which are not tip
and don't have any other tags, this would resolve to a single
space string. In the end this causes weirdnesses like the ones
you can see in the affected tests.
This is a not a big deal, but double spacing may be visually
less pleasant.
Please note that test changes where commit hashes change are
the result of marking files as resolved without removing markers.
author | Kostia Balytskyi <ikostia@fb.com> |
---|---|
date | Sat, 19 Nov 2016 15:41:37 -0800 |
parents | 940c05b25b07 |
children | eb586ed5d8ce |
comparison
equal
deleted
inserted
replaced
30459:bccd89b46cbf | 30460:ce3a133f71b3 |
---|---|
97 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 97 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
98 [1] | 98 [1] |
99 | 99 |
100 $ cat test.txt | 100 $ cat test.txt |
101 one | 101 one |
102 <<<<<<< working copy: 50c3a7e29886 - test: Merge 1 | 102 <<<<<<< working copy: 50c3a7e29886 - test: Merge 1 |
103 two-point-five | 103 two-point-five |
104 ======= | 104 ======= |
105 two-point-one | 105 two-point-one |
106 >>>>>>> merge rev: 40d11a4173a8 - test: two -> two-point-one | 106 >>>>>>> merge rev: 40d11a4173a8 - test: two -> two-point-one |
107 three | 107 three |