| commit | bb73d73c0885fce357e0d70aa51c2215a8e38a4e | |
| author | Jon Loeliger <jdl@freescale.com> | |
| Sun, 6 Nov 2005 16:26:07 +0000 (6 10:26 -0600) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 6 Nov 2005 18:31:48 +0000 (6 10:31 -0800) | ||
| tree | fef586ef93089ddb1088c003cb84cafa8ba3c81b | treesnapshot (tar.gz zip) |
| parent | 3402f1d6a3d8f4205fe59286e3a1223a9d28aea6 | commitdiff |
Refactor merge strategies into separate includable file.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| Documentation/git-merge.txt | diffblobblamehistory | |
| Documentation/git-pull.txt | diffblobblamehistory | |
| Documentation/merge-strategies.txt | [new file with mode: 0644] | blob |