Merge branch 'rs/merge-tree-simplify'
Code clean-up. * rs/merge-tree-simplify: merge-tree: remove unused df_conflict arguments
Junio C Hamano committed
Sep 19, 2014 at 11:38 UTC
7669461459aaee1587bac77c4a446e9365b582c7
No changes.