diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-11 22:37:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-11 22:37:38 -0800 |
| commit | f7a2eb735982e921ae4379f1dcf5f7a023610393 (patch) | |
| tree | 26fe2c59a8fed68a531e7b855a495f52198162a2 /gitMergeCommon.py | |
| parent | 23ea3e201cea0deea909569e08e950a9ec2345f7 (diff) | |
| parent | 7765e7ebda7e273bca34e87110be899447068b58 (diff) | |
This is GIT 1.0-rc1 in disguise. It is plausible that
relatively new parts of the system still need tweaking and
fixing, but that is why it is not 1.0 but rc ;-).
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'gitMergeCommon.py')
| -rw-r--r-- | gitMergeCommon.py | 4 |
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 |