diff options
| -rw-r--r-- | config/git/config.linux | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/git/config.linux b/config/git/config.linux index 2aa5963..f9bbcab 100644 --- a/config/git/config.linux +++ b/config/git/config.linux @@ -9,6 +9,7 @@ [merge] tool = vimdiff conflictstyle = diff3 + ff = true [mergetool] keepBackup = false prompt = false |