mirror of
https://github.com/jj-vcs/jj.git
synced 2025-12-23 06:01:01 +00:00
2ce2a445b0
Now that we can put the "from" and "to" sides on separate lines, we can use the normal "(no terminating newline)" comment on each side separately. This should also be more clear, since previously the "(no terminating newline)" comment could possibly be confused for "(removes terminating newline)". Before: ``` <<<<<<< conflict 1 of 1 +++++++ rtsqusxu 2768b0b9 "commit A" (no terminating newline) grapefruit %%%%%%% diff from: vpxusssl 38d49363 "merge base" \\\\\\\ to: ysrnknol 7a20f389 "commit B" (adds terminating newline) -grape +grape >>>>>>> conflict 1 of 1 ends ``` After: ``` <<<<<<< conflict 1 of 1 +++++++ rtsqusxu 2768b0b9 "commit A" (no terminating newline) grapefruit %%%%%%% diff from: vpxusssl 38d49363 "merge base" (no terminating newline) \\\\\\\ to: ysrnknol 7a20f389 "commit B" -grape +grape >>>>>>> conflict 1 of 1 ends ``` |
||
|---|---|---|
| .. | ||
| benches | ||
| gen-protos | ||
| proc-macros | ||
| src | ||
| tests | ||
| testutils | ||
| Cargo.toml | ||
| LICENSE | ||