diff options
| author | Elijah Newren <newren@gmail.com> | 2011-08-12 09:20:08 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-15 01:19:37 +0400 |
| commit | 4f66dade81c2ebc6e1143b6c116960bfcd837067 (patch) | |
| tree | 3ab08c659218c64d7bce3a5cb7502650a1fde854 /t/t6022-merge-rename.sh | |
| parent | edd2faf52eda344eca2c01bc0b1d9f7f2f002a42 (diff) | |
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>
Diffstat (limited to 't/t6022-merge-rename.sh')
0 files changed, 0 insertions, 0 deletions