Andrew's git / gitweb.git / diff
?
Merge branch 'rs/merge-tree-simplify'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:36 +0000 (11:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:36 +0000 (11:38 -0700)
Code clean-up.

* rs/merge-tree-simplify:
merge-tree: remove unused df_conflict arguments

Trivial merge