better_branch_name 70 builtin/merge-recursive.c o.branch1 = better_branch_name(o.branch1); better_branch_name 71 builtin/merge-recursive.c o.branch2 = better_branch_name(o.branch2);