projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 72d1216) | patch
New test case: Criss-cross merge
authorFredrik Kuivinen <freku045@student.liu.se>
Sat, 3 Dec 2005 10:41:54 +0000 (11:41 +0100)
committerJunio C Hamano <junkio@cox.net>
Sat, 3 Dec 2005 20:29:07 +0000 (12:29 -0800)
commit7057463463ad01266db264acf7e7b5e95e7b4ecf
tree5879baecaf61e2abd082f89d118cda7a5e024b2btree | snapshot
parent72d1216a04232f5cc85c6b41109db964b55f8289commit | diff
New test case: Criss-cross merge

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
t/t6021-merge-criss-cross.sh [new file with mode: 0755] blob
The core git plumbing