mergetools / gvimdiff3on commit Merge branch 'rs/use-isxdigit' into maint (437ed4c)
   1. "$MERGE_TOOLS_DIR/vimdiff"