mergetools / gvimdiff3on commit Merge branch 'jk/no-diff-emit-common' (18b26b1)
   1. "$MERGE_TOOLS_DIR/vimdiff"