From 857f26d2f41e16170e48076758d974820af685ff Mon Sep 17 00:00:00 2001
From: Fredrik Kuivinen <freku045@student.liu.se>
Date: Sat, 12 Nov 2005 00:54:55 +0100
Subject: merge-recursive: Add copyright notice

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 gitMergeCommon.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'gitMergeCommon.py')

diff --git a/gitMergeCommon.py b/gitMergeCommon.py
index 1b5bddd467..ff6f58a07c 100644
--- a/gitMergeCommon.py
+++ b/gitMergeCommon.py
@@ -1,3 +1,7 @@
+#
+# Copyright (C) 2005 Fredrik Kuivinen
+#
+
 import sys, re, os, traceback
 from sets import Set
 
-- 
cgit v1.2.1