mergetools / gvimdiff3on commit Merge branch 'jc/parseopt-verify-short-name' (5dbdb3b)
   1. "$MERGE_TOOLS_DIR/vimdiff"