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. |
||
|---|---|---|
| .. | ||
| git | ||
| gitconfig.liquid | ||
| header.erb | ||
| sapling.conf.liquid | ||
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. |
||
|---|---|---|
| .. | ||
| git | ||
| gitconfig.liquid | ||
| header.erb | ||
| sapling.conf.liquid | ||