Merge branch 'jk/fetch-reflog-df-conflict'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"