merge-recursive: Add copyright notice
authorFredrik Kuivinen <freku045@student.liu.se>
Fri, 11 Nov 2005 23:54:55 +0000 (00:54 +0100)
committerJunio C Hamano <junkio@cox.net>
Sat, 12 Nov 2005 05:14:36 +0000 (21:14 -0800)
commit857f26d2f41e16170e48076758d974820af685ff
tree11457b4624cea3dcff26d6717e042aff3f4e642f
parent46e651743ae5c0938c4ff076a0453ecc9611a520
merge-recursive: Add copyright notice

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge-recursive.py
gitMergeCommon.py