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 /contrib/svn-fe/svn-fe.c | |
parent | Merge branch 'da/styles' (diff) | |
parent | merge-tree: remove unused df_conflict arguments (diff) | |
download | tgif-7669461459aaee1587bac77c4a446e9365b582c7.tar.xz |
Merge branch 'rs/merge-tree-simplify'
Code clean-up.
* rs/merge-tree-simplify:
merge-tree: remove unused df_conflict arguments
Diffstat (limited to 'contrib/svn-fe/svn-fe.c')
0 files changed, 0 insertions, 0 deletions