diff --git a/gitMergeCommon.py b/gitMergeCommon.py
index 1b5bddd467c3d2265e8204bb90c80a2c53742b4a..ff6f58a07c8f46563d34876a70449d79d527300c 100644 (file)
--- a/gitMergeCommon.py
+++ b/gitMergeCommon.py
+#
+# Copyright (C) 2005 Fredrik Kuivinen
+#
+
import sys, re, os, traceback
from sets import Set