mergetools / vimdiff3on commit Merge branch 'jk/rerere-forget-check-enabled' into maint (5c2e654)
   1. "$MERGE_TOOLS_DIR/vimdiff"