| commit | 857f26d2f41e16170e48076758d974820af685ff | [log] [tgz] |
|---|---|---|
| author | Fredrik Kuivinen <freku045@student.liu.se> | Sat Nov 12 00:54:55 2005 +0100 |
| committer | Junio C Hamano <junkio@cox.net> | Fri Nov 11 21:14:36 2005 -0800 |
| tree | 11457b4624cea3dcff26d6717e042aff3f4e642f | |
| parent | 46e651743ae5c0938c4ff076a0453ecc9611a520 [diff] [blame] |
merge-recursive: Add copyright notice Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
diff --git a/gitMergeCommon.py b/gitMergeCommon.py index 1b5bddd..ff6f58a 100644 --- a/gitMergeCommon.py +++ b/gitMergeCommon.py
@@ -1,3 +1,7 @@ +# +# Copyright (C) 2005 Fredrik Kuivinen +# + import sys, re, os, traceback from sets import Set