mergetools / gvimdiffon commit Merge branch 'bw/protocol-v2' (5b39d49)
   1. "$MERGE_TOOLS_DIR/vimdiff"