mergetools / gvimdiff2on commit Merge branch 'sb/parse-object-buffer-eaten' (5701c3d)
   1. "$MERGE_TOOLS_DIR/vimdiff"