summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
AgeCommit message (Collapse)AuthorFilesLines
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>