mergetools / gvimdiff3on commit Merge branch 'rs/use-isxdigit' (daea6fc)
   1. "$MERGE_TOOLS_DIR/vimdiff"