fix(sapling): reorder the nvim diff def
When using nvim as a merge tool I had the files in the wrong order. It was very confusing not having the local version in the middle and the base and remote on ether side.
This commit is contained in:
parent
6cbd7eb9ae
commit
e1fc3341e6
1 changed files with 1 additions and 1 deletions
|
|
@ -30,5 +30,5 @@ pager = delta
|
|||
|
||||
[merge-tools]
|
||||
nvim_diff.executable = nvim
|
||||
nvim_diff.args = -d $local $other $base
|
||||
nvim_diff.args = -d $base $local $other
|
||||
nvim_diff.priority = 1
|
||||
|
|
|
|||
Loading…
Reference in a new issue