diff options
| author |  Fredrik Kuivinen <freku045@student.liu.se> | 2005-11-12 00:54:55 +0100 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2005-11-11 21:14:36 -0800 |
| commit | 857f26d2f41e16170e48076758d974820af685ff (patch) | |
| tree | 11457b4624cea3dcff26d6717e042aff3f4e642f | |
| parent | merge-recursive: Indent the output properly (diff) | |
| download | tgif-857f26d2f41e16170e48076758d974820af685ff.tar.xz | |
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-x | git-merge-recursive.py | 3 | ||||
| -rw-r--r-- | gitMergeCommon.py | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/git-merge-recursive.py b/git-merge-recursive.py index e6cbdde71a..21f1e924f0 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 1b5bddd467..ff6f58a07c 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 |