mergetools / gvimdiff3on commit Merge branch 'cb/t3404-shellquote' (c87eec9)
   1. "$MERGE_TOOLS_DIR/vimdiff"