projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix HTTP request result processing after slot reuse
[git.git]
/
gitMergeCommon.py
diff --git
a/gitMergeCommon.py
b/gitMergeCommon.py
index
1b5bddd
..
ff6f58a
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