Shawn O. Pearce 6b5a795bf5 Allow git-merge to select the default strategy. ...

Now that git-merge knows how to use the pull.{twohead,octopus}
configuration options to select the default merge strategy there
is no reason for git-pull to do the same immediately prior to
invoking git-merge.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

2006-12-28 01:08:06 -08:00

2.8 KiB

Executable File

Raw Blame History

View Raw