git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8a1c0d3)
merge-recursive: Restructure showing how to chain more process_* functions
authorJunio C Hamano <redacted>
Mon, 20 Sep 2010 08:28:35 +0000 (02:28 -0600)
committerJunio C Hamano <redacted>
Thu, 30 Sep 2010 00:32:36 +0000 (17:32 -0700)
commit7edba4c45c33ba1e17d88907c1601dc660a44522
tree9760e849c006fb4a648826c83a40de6ddb8b6ebetree | snapshot
parent8a1c0d322e9b6963f3be6949475983d517d79796commit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
merge-recursive.c diff | blob | history
git clone https://git.99rst.org/PROJECT