sequencer: use the recursive merge gently

In interactive rebase mode, the sequencer needs to be able to clean
up after a failed recursive merge, e.g. when an untracked file
would be overwritten and the merge (cherry-pick, actually) has to
be rescheduled.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Author: dscho

sequencer.c

@@ -395,6 +395,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
 	read_cache();
 
 	init_merge_options(&o);
+	o.gently = 1;
 	o.ancestor = base ? base_label : "(empty tree)";
 	o.branch1 = "HEAD";
 	o.branch2 = next ? next_label : "(empty tree)";