diff options
Diffstat (limited to 'files/.gitconfig')
| -rw-r--r-- | files/.gitconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/files/.gitconfig b/files/.gitconfig index 9ea6405..a88a1c3 100644 --- a/files/.gitconfig +++ b/files/.gitconfig @@ -159,6 +159,8 @@ process = git-lfs filter-process [mergetool "fugitive"] cmd = vim -c \"Gdiff\" \"$MERGED\" +[am] + threeWay = true [fetch] prune = true writeCommitGraph = true |