summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorFredrik Kuivinen <freku045@student.liu.se>2005-12-03 10:41:54 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-03 20:29:07 (GMT)
commit7057463463ad01266db264acf7e7b5e95e7b4ecf (patch)
tree5879baecaf61e2abd082f89d118cda7a5e024b2b /compat
parent72d1216a04232f5cc85c6b41109db964b55f8289 (diff)
downloadgit-7057463463ad01266db264acf7e7b5e95e7b4ecf.zip
git-7057463463ad01266db264acf7e7b5e95e7b4ecf.tar.gz
git-7057463463ad01266db264acf7e7b5e95e7b4ecf.tar.bz2
New test case: Criss-cross merge
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'compat')
0 files changed, 0 insertions, 0 deletions