Age | Commit message (Collapse) | Author | |
---|---|---|---|
2005-12-03 | New test case: merge with directory/file conflicts | Fredrik Kuivinen | |
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> |
index : git | ||
Git: sistema de control de versiones | mirror |
summaryrefslogtreecommitdiff |
Age | Commit message (Collapse) | Author | |
---|---|---|---|
2005-12-03 | New test case: merge with directory/file conflicts | Fredrik Kuivinen | |
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> |