diff options
| -rw-r--r-- | merge-ort.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/merge-ort.c b/merge-ort.c index 1c5b2f7e3b..26f357e524 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -870,7 +870,11 @@ static int process_renames(struct merge_options *opt, rename_branch, delete_branch); } else { /* normal rename */ - die("Not yet implemented"); + memcpy(&newinfo->stages[other_source_index], + &oldinfo->stages[other_source_index], + sizeof(newinfo->stages[0])); + newinfo->filemask |= (1 << other_source_index); + newinfo->pathnames[other_source_index] = oldpath; } } |