diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2022-05-18 09:07:29 +0200 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2022-05-18 09:07:29 +0200 |
| commit | ba6a213c2996710aa47990be2b7ad0fb14d35660 (patch) | |
| tree | 93d066cb1eef9888366442169b8d2e961c9111f0 /%HOME% | |
| parent | ssh: reorder hosts (diff) | |
| download | linux-home-ba6a213c2996710aa47990be2b7ad0fb14d35660.tar.gz linux-home-ba6a213c2996710aa47990be2b7ad0fb14d35660.zip | |
.gitconfig: merge.conflictStyle = diff3
Diffstat (limited to '%HOME%')
| -rw-r--r-- | %HOME%/.gitconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/%HOME%/.gitconfig b/%HOME%/.gitconfig index 9312ee4..096029d 100644 --- a/%HOME%/.gitconfig +++ b/%HOME%/.gitconfig @@ -41,6 +41,9 @@ # Follow renames: follow = true +[merge] + # Show the common ancestor when resolving a conflict: + conflictStyle = diff3 [mergetool] # I don't even know why those are necessary, since we can abort and # retry merges. |