mergetools / gvimdiff3on commit Merge branch 'jk/fetch-reflog-df-conflict' (a1671dd)
   1. "$MERGE_TOOLS_DIR/vimdiff"