mergetools / gvimdiffon commit Merge branch 'jt/test-protocol-version' (24d73d2)
   1. "$MERGE_TOOLS_DIR/vimdiff"