I want to use vim (fugitive possibly) to merge my conflicts, but I hate the automerged conflict markers. I'm looking for something like
|-------------------------------|
| | | |
| LOCAL | HEAD | REMOTE |
| | | |
|-------------------------------|
| |
| clean head to merge |
| changes into |
|-------------------------------|
How do I set this up?