diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-09-20 02:28:35 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:32:36 -0700 |
| commit | 7edba4c45c33ba1e17d88907c1601dc660a44522 (patch) | |
| tree | 9760e849c006fb4a648826c83a40de6ddb8b6ebe /t/t3900 | |
| parent | t3030: Add a testcase for resolvable rename/add conflict with symlinks (diff) | |
| download | tgif-7edba4c45c33ba1e17d88907c1601dc660a44522.tar.xz | |
merge-recursive: Restructure showing how to chain more process_* functions
In 3734893 (merge-recursive: Fix D/F conflicts 2010-07-09),
process_df_entry() was added to process_renames() and process_entry() but
in a somewhat restrictive manner. Modify the code slightly to make it
clearer how we could chain more such functions if necessary, and alter
process_df_entry() to handle such chaining.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3900')
0 files changed, 0 insertions, 0 deletions