|
|
|
|
|
|
by Myrmornis
1610 days ago
|
|
|
(plug) delta does special display of diff3 merge conflicts: https://github.com/dandavison/delta#merge-conflicts It displays two diffs: one from the ancestral commit to “ours” and one from the ancestral commit to “theirs”. I find it helpful for understanding conflicts and how to resolve them — any feedback appreciated. |
|
|