diff options
| -rw-r--r-- | merge-recursive.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index f172df1695..e6a6a81ec2 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -353,6 +353,13 @@ static void make_room_for_directories_of_df_conflicts(struct merge_options *o, int last_len = 0; int i; + /* + * If we're merging merge-bases, we don't want to bother with + * any working directory changes. + */ + if (o->call_depth) + return; + for (i = 0; i < entries->nr; i++) { const char *path = entries->items[i].string; int len = strlen(path); |