From 857f26d2f41e16170e48076758d974820af685ff Mon Sep 17 00:00:00 2001 From: Fredrik Kuivinen Date: Sat, 12 Nov 2005 00:54:55 +0100 Subject: [PATCH] merge-recursive: Add copyright notice Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano --- git-merge-recursive.py | 3 +++ gitMergeCommon.py | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/git-merge-recursive.py b/git-merge-recursive.py index e6cbdde7..21f1e924 100755 --- a/git-merge-recursive.py +++ b/git-merge-recursive.py @@ -1,4 +1,7 @@ #!/usr/bin/python +# +# Copyright (C) 2005 Fredrik Kuivinen +# import sys, math, random, os, re, signal, tempfile, stat, errno, traceback from heapq import heappush, heappop diff --git a/gitMergeCommon.py b/gitMergeCommon.py index 1b5bddd4..ff6f58a0 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 -- 2.11.0