mergetools / vimdiff3on commit Merge branch 'nd/shallow-fixup' (3c9979b)
   1. "$MERGE_TOOLS_DIR/vimdiff"