diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-19 11:38:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-19 11:38:36 -0700 |
| commit | 7669461459aaee1587bac77c4a446e9365b582c7 (patch) | |
| tree | 9a0df04516127d09ee2a6d4fc813380d1a4e40bb /config.c | |
| parent | 83510ef3fda0df6acd6680410698a1762042a8af (diff) | |
| parent | 57065289a9ef2fc962ec7f82f9771b45eba8dba1 (diff) | |
| download | git-7669461459aaee1587bac77c4a446e9365b582c7.tar.gz | |
Merge branch 'rs/merge-tree-simplify'
Code clean-up.
* rs/merge-tree-simplify:
merge-tree: remove unused df_conflict arguments
Diffstat (limited to 'config.c')
0 files changed, 0 insertions, 0 deletions