Skip to content

Commit 857f26d

Browse files
Fredrik KuivinenJunio C Hamano
authored andcommitted
merge-recursive: Add copyright notice
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 46e6517 commit 857f26d

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

git-merge-recursive.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#!/usr/bin/python
2+
#
3+
# Copyright (C) 2005 Fredrik Kuivinen
4+
#
25

36
import sys, math, random, os, re, signal, tempfile, stat, errno, traceback
47
from heapq import heappush, heappop

gitMergeCommon.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#
2+
# Copyright (C) 2005 Fredrik Kuivinen
3+
#
4+
15
import sys, re, os, traceback
26
from sets import Set
37

0 commit comments

Comments
 (0)