Elijah Newren <newren@xxxxxxxxx> writes: > From: Derrick Stolee <stolee@xxxxxxxxx> > > In handle_rename_rename_1to2(), we have duplicated error handling > around colliding paths. Specifically, when we want to write out > the file and there is a directory or untracked file in the way, > we need to create a temporary file to hold the contents. This has > some special output to alert the user, and this output is > duplicated for each side of the conflict. > > Simplify the call by generating this new path in a helper > function. > > Signed-off-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx> > Signed-off-by: Elijah Newren <newren@xxxxxxxxx> > --- > merge-recursive.c | 53 ++++++++++++++++++++++++----------------------- > 1 file changed, 27 insertions(+), 26 deletions(-) Thanks, both. Let's advance these patches to 'next' soonish.
