Pick up bugfix for ThierryGoubier/GitFileTree-MergeDriver#1

ThierryGoubier/GitFileTree-MergeDriver#1