conflicts: label closing delimeter with conflict number

This follows up on https://github.com/martinvonz/jj/pull/3459 and adds a label to the closing delimeter of each conflict, e.g. "Conflict 1 of 3 ends". I didn't initially put any label at the ending delimeter since the starting delimeter is already marked with "Conflict 1 of 3". However, I'm now realizing that when I resolve conflicts, I usually go from top to bottom. The first thing I do is delete the starting conflict delimeter. It is when I get to the *end* of the conflict that I wonder whether there are any more conflicts left in the file.

Ilya Grigoriev committed 2 years ago

Commit 1f7c4ec1 parent 7812beb10 files · +49 −46Browse files

Showing the changes to cli/tests/test_interdiff_command.rs (1 of 10 files). Show all

Unified · Split

cli/tests/test_interdiff_command.rs+1−1

@@ -159,7 +159,7 @@ fn test_interdiff_conflicting() { · 158 unmodified lines
159	-+abc	159	-+abc
160	-+++++++ Contents of side #2	160	-+++++++ Contents of side #2
161	-bar	161	-bar
162	->>>>>>>	162	->>>>>>> Conflict 1 of 1 ends
163	+def	163	+def
164	"###);	164	"###);
165	}	165	}