Merge branch 'jc/extended-fake-ancestor-for-gitlink'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"