mergetools / gvimdiffon commit Merge branch 'jk/tree-walk-overflow' (1b01cdb)
   1. "$MERGE_TOOLS_DIR/vimdiff"