projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mz/pick-unborn' into maint
[git.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index d8820604ca3535ce25796012412fe69f1cbdd37b..33ba5dc07c86a81f0989927b9a6167833815533f 100644
(file)
--- a/
merge-recursive.c
+++ b/
merge-recursive.c
@@
-976,7
+976,7
@@
merge_file_special_markers(struct merge_options *o,
return mfi;
}
return mfi;
}
-static struct merge_file_info merge_file(struct merge_options *o,
+static struct merge_file_info merge_file
_one
(struct merge_options *o,
const char *path,
const unsigned char *o_sha, int o_mode,
const unsigned char *a_sha, int a_mode,
const char *path,
const unsigned char *o_sha, int o_mode,
const unsigned char *a_sha, int a_mode,
@@
-1166,7
+1166,7
@@
static void conflict_rename_rename_1to2(struct merge_options *o,
struct merge_file_info mfi;
struct diff_filespec other;
struct diff_filespec *add;
struct merge_file_info mfi;
struct diff_filespec other;
struct diff_filespec *add;
- mfi = merge_file(o, one->path,
+ mfi = merge_file
_one
(o, one->path,
one->sha1, one->mode,
a->sha1, a->mode,
b->sha1, b->mode,
one->sha1, one->mode,
a->sha1, a->mode,
b->sha1, b->mode,
@@
-1450,7
+1450,7
@@
static int process_renames(struct merge_options *o,
ren1_dst, branch2);
if (o->call_depth) {
struct merge_file_info mfi;
ren1_dst, branch2);
if (o->call_depth) {
struct merge_file_info mfi;
- mfi = merge_file(o, ren1_dst, null_sha1, 0,
+ mfi = merge_file
_one
(o, ren1_dst, null_sha1, 0,
ren1->pair->two->sha1, ren1->pair->two->mode,
dst_other.sha1, dst_other.mode,
branch1, branch2);
ren1->pair->two->sha1, ren1->pair->two->mode,
dst_other.sha1, dst_other.mode,
branch1, branch2);