3 ms·
An IMHO significant improvement is setting merge.conflictStyle = diff3, so you get to see the original code as well: <<<<<<< My new code ||||||| The or
by AnssiH 9y ago
An IMHO significant improvement is setting merge.conflictStyle = diff3, so you get to see the original code as well:
<<<<<<<
My new code
|||||||
The original code
=======
The conflicting 'theirs' code
>>>>>>>
Same option for the non-git regular 'patch' command is "--merge=diff3".