diff options
| author | Fredrik Kuivinen <freku045@student.liu.se> | 2005-09-12 23:29:06 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-12 14:53:55 -0700 |
| commit | 8ceba720ba5e5e76384e46629e599124c6f36409 (patch) | |
| tree | 433b0b4d8c83bee9cfde856b0765a8b9cba531db /gitMergeCommon.py | |
| parent | Allow finding things that begin with a dash in 'git grep' (diff) | |
| download | git-8ceba720ba5e5e76384e46629e599124c6f36409.tar.gz git-8ceba720ba5e5e76384e46629e599124c6f36409.zip | |
[PATCH] Fix assertion failure when merging common ancestors.
Bug reported by Junio.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'gitMergeCommon.py')
0 files changed, 0 insertions, 0 deletions