mergetools / vimdiff2on commit Merge branch 'jc/maint-reflog-expire-clean-mark-typofix' into maint (1d66383)
   1. "$MERGE_TOOLS_DIR/vimdiff"