undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive: Add copyright notice

Browse Source 
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Fredrik Kuivinen 2005-11-12 00:54:55 +01:00 committed by Junio C Hamano
parent 46e651743a
commit 857f26d2f4
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-merge-recursive.py
View File

@ -1,4 +1,7 @@
#!/usr/bin/python #!/usr/bin/python
#
# Copyright (C) 2005 Fredrik Kuivinen
#
import sys, math, random, os, re, signal, tempfile, stat, errno, traceback import sys, math, random, os, re, signal, tempfile, stat, errno, traceback
from heapq import heappush, heappop from heapq import heappush, heappop

4
gitMergeCommon.py
View File

@ -1,3 +1,7 @@
#
# Copyright (C) 2005 Fredrik Kuivinen
#
import sys, re, os, traceback import sys, re, os, traceback
from sets import Set from sets import Set