Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gitMergeCommon.py')
-rw-r--r--gitMergeCommon.py4
1 files changed, 4 insertions, 0 deletions
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