mergetools / gvimdiff3on commit Merge branch 'jk/test-send-sh-x-trace-elsewhere' into maint (68a6e97)
   1. "$MERGE_TOOLS_DIR/vimdiff"