From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Sep 2014 18:38:36 +0000 (-0700)
Subject: Merge branch 'rs/merge-tree-simplify'
X-Git-Tag: v2.2.0-rc0~112
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7669461459aaee1587bac77c4a446e9365b582c7

Merge branch 'rs/merge-tree-simplify'

Code clean-up.

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

7669461459aaee1587bac77c4a446e9365b582c7