summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredrik Kuivinen <freku045@student.liu.se>2005-11-11 23:54:55 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-12 05:14:36 (GMT)
commit857f26d2f41e16170e48076758d974820af685ff (patch)
tree11457b4624cea3dcff26d6717e042aff3f4e642f
parent46e651743ae5c0938c4ff076a0453ecc9611a520 (diff)
downloadgit-857f26d2f41e16170e48076758d974820af685ff.zip
git-857f26d2f41e16170e48076758d974820af685ff.tar.gz
git-857f26d2f41e16170e48076758d974820af685ff.tar.bz2
merge-recursive: Add copyright notice
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xgit-merge-recursive.py3
-rw-r--r--gitMergeCommon.py4
2 files changed, 7 insertions, 0 deletions
diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index e6cbdde..21f1e92 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 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