Mark Hollomon c8e2db00f9 Let merge set the default strategy. ...

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>

2006-03-15 16:14:33 -08:00

2.3 KiB

Executable File

Raw Blame History

View Raw