Andrew's git / gitweb.git / diff
?
Let merge set the default strategy.
authorMark Hollomon <markhollomon@comcast.net>
Wed, 15 Mar 2006 22:51:41 +0000 (22:51 +0000)
committerJunio C Hamano <junkio@cox.net>
Thu, 16 Mar 2006 00:14:33 +0000 (16:14 -0800)
If the user does not set a merge strategy for git-pull,
let git-merge calculate a default strategy.

[jc: with minor stylistic tweaks]

Signed-off-by: Mark Hollomon <markhollomon@comcast.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
No differences found