diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/.config/git/config | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/home/.config/git/config b/home/.config/git/config index 46b34c2..0ead8e7 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -43,6 +43,8 @@ [merge "mergiraf"] name = mergiraf driver = mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P +[mergetool] + keepTemporaries = false [mergetool "conflictmarker"] cmd = $EDITOR "$MERGED" [commit] |