merge-recursive: Cleanup and consolidation of rename_conflict_info
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:08 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:37 +0000 (14:19 -0700)
commit4f66dade81c2ebc6e1143b6c116960bfcd837067
tree3ab08c659218c64d7bce3a5cb7502650a1fde854
parentedd2faf52eda344eca2c01bc0b1d9f7f2f002a42
merge-recursive: Cleanup and consolidation of rename_conflict_info

The consolidation of process_entry() and process_df_entry() allows us to
consolidate more code paths concerning rename conflicts, and to do
a few additional related cleanups.  It also means we are using
rename_df_conflict_info in some cases where there is no D/F conflict;
rename it to rename_conflict_info.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c