diff options
| author | Daniel Barkalow <barkalow@iabervon.org> | 2005-09-05 02:04:48 -0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-10 18:27:41 -0700 |
| commit | ee6566e8d70da682ac4926dd8a67ac821b2c1743 (patch) | |
| tree | d6cc5010453ba331083665da865d4ede24a5573a /gitMergeCommon.py | |
| parent | [PATCH] Add function to append to an object_list. (diff) | |
| download | git-ee6566e8d70da682ac4926dd8a67ac821b2c1743.tar.gz git-ee6566e8d70da682ac4926dd8a67ac821b2c1743.zip | |
[PATCH] Rewrite read-tree
Adds support for multiple ancestors, removes --emu23, much simplification.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'gitMergeCommon.py')
0 files changed, 0 insertions, 0 deletions