After seeing the change in [ff2a87103b], we see a situation where the onlyDirect affects. I don't know if it is a big trouble or if the situation can be improved.

Consider this graph:

<verbatim>
[V]_
 |  \
 |  _[M]
 | /  |
[P]   |
 |  _[rename]
 | /
[ ]
</verbatim>

With the long trip (directOnly), the merge from M to V looks like a RENAME. With the short trip, it looks like ADDED/DELETE.

What do you think?