merge-recursive: Add copyright notice
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Fredrik Kuivinen committed
Nov 12, 2005 at 00:54 UTC
857f26d2f41e16170e48076758d974820af685ff
2 files changed
+7
git-merge-recursive.py
+3
@@ -1,4 +1,7 @@
1
#!/usr/bin/python
2
+#
3
+# Copyright (C) 2005 Fredrik Kuivinen
4
+#
5
6
import sys, math, random, os, re, signal, tempfile, stat, errno, traceback
7
from heapq import heappush, heappop
gitMergeCommon.py
+4
@@ -1,3 +1,7 @@
1
+#
2
+# Copyright (C) 2005 Fredrik Kuivinen
3
+#
4
+
5
import sys, re, os, traceback
6
from sets import Set
7