| Age | Commit message (Collapse) | Author | Files | Lines | |
|---|---|---|---|---|---|
| 2006-12-12 | merge-recursive: add/add really is modify/modify with an empty base |  Johannes Schindelin | 1 | -1/+11 | |
| Unify the handling for cases C (add/add) and D (modify/modify). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | |||||
| 2006-12-12 | add test case for recursive merge |  Junio C Hamano | 1 | -0/+70 | |
| This test case is based on the bug report by Shawn Pearce. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | |||||
 |
index : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |