Commit d962b3f4 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

Merge pull request #8796 from liurs1990:master

parents 11af7b7e cc3fdd00
......@@ -335,6 +335,8 @@ public:
head = comp1->head;
tail = comp2->tail;
size = comp1->size + comp2->size;
// update the history size
history->size =size;
CompHistory *h1 = history->child_;
CompHistory *h2 = comp2->history;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment