mergetools / gvimdiff2on commit Merge branch 'jc/extended-fake-ancestor-for-gitlink' (d3354cd)
   1. "$MERGE_TOOLS_DIR/vimdiff"