mergetools / gvimdiffon commit Merge branch 'fc/rerere-conflict-style' into maint (ada8710)
   1. "$MERGE_TOOLS_DIR/vimdiff"