mergetools / gvimdiff2on commit Merge branch 'po/rerere-doc-fmt' (98a8fcc)
   1. "$MERGE_TOOLS_DIR/vimdiff"