3

I am using fugitive.vim's :Gdiff. I would like to get the diff between the head and the common ancestor and between merge and the common ancestor. I am using instructions from here Show base in fugitive.vim conflict diff, to get the following:

+---------------------------------------+
|         common ancestor (:1)          |
+-----------+--------------+------------+
|           |              |            |
| HEAD (:2) | working copy | merge (:3) |
|           |              |            |
+-----------+--------------+------------+

However I would like to also see the diff between (:2) and (:1) and between (:3) and (:1)

Community
  • 1
  • 1
Roman Spiegelman
  • 41
  • 1

2 Answers2

1

The splice plugin aims at resolving conflicts during three-way merges. It'll permit to quickly select which buffers shall be compared.

However, it won't show what your are looking for because of a vim limitation: there can be only one diff at a time (even if it involves more than one buffer).

Luc Hermitte
  • 31,979
  • 7
  • 69
  • 83
0

I use this vim as a git mergetool script. It diffs the common ancestor with (:2) or (:3), however they are in a different tab.

Lakshman Kumar
  • 43
  • 4