diff options
Diffstat (limited to 'src/checkout_conflicts.c')
| -rw-r--r-- | src/checkout_conflicts.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/checkout_conflicts.c b/src/checkout_conflicts.c index 0c9c768df..45e43a324 100644 --- a/src/checkout_conflicts.c +++ b/src/checkout_conflicts.c @@ -395,7 +395,10 @@ static int checkout_write_entry( if (git_buf_puts(&data->path, side->path) < 0) return -1; - if (conflict->name_collision || conflict->directoryfile) { + if ((conflict->name_collision || conflict->directoryfile) && + (data->strategy & GIT_CHECKOUT_USE_OURS) == 0 && + (data->strategy & GIT_CHECKOUT_USE_THEIRS) == 0) { + if (side == conflict->ours) side_label = data->opts.our_label ? data->opts.our_label : "ours"; |