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.
Showing the changes to cli/tests/test_diffedit_command.rs (1 of 10 files). Show all
Unified · Split
| @@ -402,7 +402,7 @@ fn test_diffedit_merge() { · 401 unmodified lines | |||
| 402 | +c | 402 | +c |
| 403 | +++++++ Contents of side #2 | 403 | +++++++ Contents of side #2 |
| 404 | b | 404 | b |
| 405 | >>>>>>> | 405 | >>>>>>> Conflict 1 of 1 ends |
| 406 | "###); | 406 | "###); |
| 407 | } | 407 | } |
| 408 | 408 | ||