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