diff options
| author | Mark Hollomon <markhollomon@comcast.net> | 2006-03-15 22:51:41 +0000 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-15 16:14:33 -0800 |
| commit | c8e2db00f9622af6e5f640443dfbe63bb1af39e0 (patch) | |
| tree | 7c32c149066695f8cfa08abaa7a7a31f5118b0ac /COPYING | |
| parent | c982647310fc5acd0bd6ebc408e70470447b387f (diff) | |
| download | git-c8e2db00f9622af6e5f640443dfbe63bb1af39e0.tar.gz | |
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>
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions