mergetools / gvimdiff2on commit Merge branch 'ah/reflog-typofix-in-error' (bc1c600)
   1. "$MERGE_TOOLS_DIR/vimdiff"