mergetools / vimdiff3on commit Merge branch 'fc/rerere-conflict-style' (6d3c4e9)
   1. "$MERGE_TOOLS_DIR/vimdiff"