1. Stefan Saasen
  2. git

Commits

Fredrik Kuivinen  committed 857f26d

merge-recursive: Add copyright notice

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

  • Participants
  • Parent commits 46e6517
  • Branches master

Comments (0)

Files changed (2)

File git-merge-recursive.py

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

File gitMergeCommon.py

View file
+#
+# Copyright (C) 2005 Fredrik Kuivinen
+#
+
 import sys, re, os, traceback
 from sets import Set