| commit | 7669461459aaee1587bac77c4a446e9365b582c7 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 19 Sep 2014 18:38:36 +0000 (19 11:38 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 19 Sep 2014 18:38:36 +0000 (19 11:38 -0700) | ||
| tree | 9a0df04516127d09ee2a6d4fc813380d1a4e40bb | treesnapshot (tar.gz zip) |
| parent | 83510ef3fda0df6acd6680410698a1762042a8af | commitdiff |
| parent | 57065289a9ef2fc962ec7f82f9771b45eba8dba1 | commitdiff |
Merge branch 'rs/merge-tree-simplify'
Code clean-up.
* rs/merge-tree-simplify:
merge-tree: remove unused df_conflict arguments
Code clean-up.
* rs/merge-tree-simplify:
merge-tree: remove unused df_conflict arguments