| commit | 7ba3c078c76cbda00f7ed2ac16a659d8f48631ba | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Thu, 28 Dec 2006 07:35:20 +0000 (28 02:35 -0500) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Fri, 29 Dec 2006 03:06:16 +0000 (28 19:06 -0800) | ||
| tree | 200a059a4cc17a1079ede6af0310e57e6e5826a2 | treesnapshot (tar.gz zip) |
| parent | eff73751bb94b0241fd2204effb8680fe9973cbf | commitdiff |
Move better_branch_name above get_ref in merge-recursive.
To permit the get_ref function to use the static better_branch_name
function to generate a string on demand I'm moving it up earlier.
The actual logic was not affected in this change.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
To permit the get_ref function to use the static better_branch_name
function to generate a string on demand I'm moving it up earlier.
The actual logic was not affected in this change.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| merge-recursive.c | diffblobblamehistory |