mergetools / vimdiff3on commit Merge branch 'jc/diff-b-m' (f41157e)
   1. "$MERGE_TOOLS_DIR/vimdiff"