mergetools / gvimdiff2on commit Merge branch 'jc/maint-reflog-expire-clean-mark-typofix' (212ca64)
   1. "$MERGE_TOOLS_DIR/vimdiff"