From: Fredrik Kuivinen <freku045@student.liu.se>
Date: Fri, 11 Nov 2005 23:54:55 +0000 (+0100)
Subject: merge-recursive: Add copyright notice
X-Git-Tag: v0.99.9h^2~17
X-Git-Url: https://git.octo.it/?p=git.git;a=commitdiff_plain;h=857f26d2f41e16170e48076758d974820af685ff

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 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