mergetools / gvimdiffon commit Merge branch 'jk/test-match-signal' into maint (e5a730a)
   1. "$MERGE_TOOLS_DIR/vimdiff"