Ilya Grigoriev 1f7c4ec60a 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.		2024-05-20 18:36:51 -07:00
..
benches
gen-protos
proc-macros	cargo: explicitly indicate paths to publish	2024-04-15 20:37:00 -07:00
src	conflicts: label closing delimeter with conflict number	2024-05-20 18:36:51 -07:00
tests	conflicts: label closing delimeter with conflict number	2024-05-20 18:36:51 -07:00
testutils	cleanup: consistently use BackendResult	2024-05-07 19:35:03 -07:00
Cargo.toml	cargo: explicitly indicate paths to publish	2024-04-15 20:37:00 -07:00
LICENSE