X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge-recursive.py;h=21f1e924f01fa69523bbc6f96873930da4172c99;hb=857f26d2f41e16170e48076758d974820af685ff;hp=e6cbdde71ad94303a728e0083a3375280f49a7df;hpb=46e651743ae5c0938c4ff076a0453ecc9611a520;p=git.git

diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index e6cbdde7..21f1e924 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