diff options
| author | Grégoire Duchêne <gduchene@awhk.org> | 2022-01-29 13:24:54 +0000 |
|---|---|---|
| committer | Grégoire Duchêne <gduchene@awhk.org> | 2022-01-29 13:24:54 +0000 |
| commit | 127705b957339b1d4b70ff33488d5b9b53872316 (patch) | |
| tree | f7a2690c92cdcaeca979f691f081f72ef855545b /git | |
| parent | 36ad01f7fa3c94647860f3b0ed73879c608fcf12 (diff) | |
git: Set conflict style to ‘zdiff3’
Diffstat (limited to 'git')
| -rw-r--r-- | git/config | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -19,6 +19,9 @@ [init] defaultBranch = main +[merge] + conflictStyle = zdiff3 + [pull] ff = only |