diff options
Diffstat (limited to 'home/.config/git/config')
| -rw-r--r-- | home/.config/git/config | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/home/.config/git/config b/home/.config/git/config index 4500dc4..8638332 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -35,7 +35,10 @@ ff = only [merge] tool = conflictmarker - conflictstyle = diff3 + conflictstyle = zdiff3 +[merge "mergiraf"] + name = mergiraf + driver = mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P [mergetool "conflictmarker"] cmd = $EDITOR "$MERGED" [commit] |