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/git-merge-recursive.py b/git-merge-recursive.py
index e6cbdde..21f1e92 100755 (executable)
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
@@ -1,4 +1,7 @@
 #!/usr/bin/python
 #!/usr/bin/python

+#
+# Copyright (C) 2005 Fredrik Kuivinen
+#

 
 import sys, math, random, os, re, signal, tempfile, stat, errno, traceback
 from heapq import heappush, heappop
 
 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 1b5bddd..ff6f58a 100644 (file)
--- a/gitMergeCommon.py
+++ b/gitMergeCommon.py
@@ -1,3 +1,7 @@
+#
+# Copyright (C) 2005 Fredrik Kuivinen
+#
+

 import sys, re, os, traceback
 from sets import Set
 
 import sys, re, os, traceback
 from sets import Set