From: Fredrik Kuivinen Date: Fri, 11 Nov 2005 23:54:55 GMT Subject: [PATCH 2/3] merge-recursive: Add copyright notice Message-ID: <20051111235455.GB9757@c165.ib.student.liu.se> Signed-off-by: Fredrik Kuivinen --- git-merge-recursive.py | 3 +++ gitMergeCommon.py | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) applies-to: ec5d71bfe5c1519652081888a49f36b1bd044975 eeffb2de39045197fe945959e7029ca146540353 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 --- 0.99.9.GIT