mergetools / gvimdiff3on commit Merge branch 'bw/kwset-use-unsigned' into maint (ae8ada4)
   1. "$MERGE_TOOLS_DIR/vimdiff"