X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=gitMergeCommon.py;h=ff6f58a07c8f46563d34876a70449d79d527300c;hb=6d016c9c7f21a97249c4571e8d7265da1fd2f083;hp=1b5bddd467c3d2265e8204bb90c80a2c53742b4a;hpb=72e5890b68e7199d92620d3bba91fa36dd259404;p=git.git

diff --git a/gitMergeCommon.py b/gitMergeCommon.py
index 1b5bddd4..ff6f58a0 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