mergetools / gvimdiff3on commit Merge branch 'pb/test-must-fail-is-for-git' (c7f352f)
   1. "$MERGE_TOOLS_DIR/vimdiff"