mergetools / vimdiff3on commit Merge branch 'jc/merge' (bcd1ecd)
   1. "$MERGE_TOOLS_DIR/vimdiff"