mergetools / gvimdiff3on commit Merge branch 'ab/sha1dc' (2db8732)
   1. "$MERGE_TOOLS_DIR/vimdiff"