Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
shell.c: complain on insufficient arguments.
[gitweb.git]
/
gitMergeCommon.py
diff --git
a/gitMergeCommon.py
b/gitMergeCommon.py
index 1b5bddd467c3d2265e8204bb90c80a2c53742b4a..ff6f58a07c8f46563d34876a70449d79d527300c 100644
(file)
--- a/
gitMergeCommon.py
+++ b/
gitMergeCommon.py
@@
-1,3
+1,7
@@
+#
+# Copyright (C) 2005 Fredrik Kuivinen
+#
+
import sys, re, os, traceback
from sets import Set