mergetools / gvimdiff2on commit Merge branch 'sb/object-id' (3943f6c)
   1. "$MERGE_TOOLS_DIR/vimdiff"