Browse Source

merge-recursive: Add copyright notice

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Fredrik Kuivinen 20 years ago committed by Junio C Hamano
parent
commit
857f26d2f4
  1. 3
      git-merge-recursive.py
  2. 4
      gitMergeCommon.py

3
git-merge-recursive.py

@ -1,4 +1,7 @@ @@ -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

4
gitMergeCommon.py

@ -1,3 +1,7 @@ @@ -1,3 +1,7 @@
#
# Copyright (C) 2005 Fredrik Kuivinen
#

import sys, re, os, traceback
from sets import Set


Loading…
Cancel
Save