2012/4/5 R. David Murray :
> I just tried to merge a change from 3.2 to default and found an unexpected
> file being merged. Looking at the graph, it *looks* like Sandro copied a
> change to default instead of merging it, even though his commit comment
> says merge. That would be fine, I'd just d
I just tried to merge a change from 3.2 to default and found an unexpected
file being merged. Looking at the graph, it *looks* like Sandro copied a
change to default instead of merging it, even though his commit comment
says merge. That would be fine, I'd just do a null merge...except that
the fi
