merge-recursive: Add copyright notice

Signed-off-by: Fredrik Kuivinen <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index e6cbdde71ad94303a728e0083a3375280f49a7df..21f1e924f01fa69523bbc6f96873930da4172c99 100755 (executable)
--- 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 1b5bddd467c3d2265e8204bb90c80a2c53742b4a..ff6f58a07c8f46563d34876a70449d79d527300c 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