mergetools / vimdiff3on commit Merge branch 'jc/rerere-multi' (ec34a8b)
   1. "$MERGE_TOOLS_DIR/vimdiff"