Julian Prein d30b102e42 git: Set merge.conflictstyle to diff3 ...

Display original text in addition to changes from both sides.

2024-09-21 00:03:34 +02:00

..

config

git: Set merge.conflictstyle to diff3

2024-09-21 00:03:34 +02:00

ignore

git:ignore: Add build/

2024-01-05 15:26:20 +01:00