mergetools / vimdiff3on commit Merge branch 'mg/complete-cherry-mark-to-log' (f044297)
   1. "$MERGE_TOOLS_DIR/vimdiff"