projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d3bfdb7) | patch
New test case: merge with directory/file conflicts
authorFredrik Kuivinen <freku045@student.liu.se>
Sat, 3 Dec 2005 10:41:20 +0000 (11:41 +0100)
committerJunio C Hamano <junkio@cox.net>
Sat, 3 Dec 2005 20:29:05 +0000 (12:29 -0800)
commit72d1216a04232f5cc85c6b41109db964b55f8289
tree101331aeb001e6c77947a2d016ee6d485a2fdac9tree | snapshot
parentd3bfdb755e06c04492ad3977e7df3d780b6e02f2commit | diff
New test case: merge with directory/file conflicts

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