summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
AgeCommit message (Collapse)AuthorFilesLines
2005-12-08Documentation: recursive is the default strategy these days.Libravatar Junio C Hamano1-5/+5
We still said resolve was the default in handful places. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-06Refactor merge strategies into separate includable file.Libravatar Jon Loeliger1-0/+35
Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>