diff options
| author | Anton Bobov <anton@bobov.name> | 2026-04-07 23:06:24 +0500 |
|---|---|---|
| committer | Anton Bobov <anton@bobov.name> | 2026-04-07 23:45:39 +0500 |
| commit | 79edde180e69441837dc13f0398a7836249ca1cd (patch) | |
| tree | 9fdde67927b470368b26c945be5d4224b8d3fa96 /files | |
| parent | 04d513134f6907e24a010fbf5b0e5eb172ad9b38 (diff) | |
git: enable three-way merge for git am operations
Diffstat (limited to 'files')
| -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 |