diff options
| author | Toby Vincent <tobyv@tobyvin.dev> | 2024-07-26 18:54:14 -0500 |
|---|---|---|
| committer | Toby Vincent <tobyv@tobyvin.dev> | 2024-07-26 18:54:14 -0500 |
| commit | 768a4c90dcfd541c67781919dd2a791f0ceed92d (patch) | |
| tree | be92f6992201d7bcfd50b78eec8adc6ad943d52d /git/.config | |
| parent | 86ab4702891c3b889ff1005fdf90e6457de106bf (diff) | |
fix(git): use 3way layout for mergetool
Diffstat (limited to 'git/.config')
| -rw-r--r-- | git/.config/git/config | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/git/.config/git/config b/git/.config/git/config index 3c582a6..006a8a9 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -49,9 +49,6 @@ difftool = true [merge] tool = nvimdiff -[mergetool "nvimdiff"] -layout = "MERGED" - [trailer] separators = ":#" |