| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2005-12-08 | Documentation: recursive is the default strategy these days. | Junio C Hamano | |
| We still said resolve was the default in handful places. Signed-off-by: Junio C Hamano <junkio@cox.net> | |||
| 2005-11-06 | Refactor merge strategies into separate includable file. | Jon Loeliger | |
| Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | |||
 |
index : git | |
| Git: sistema de control de versiones | mirror |
| summaryrefslogtreecommitdiff |