diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-11 01:21:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-11 18:52:30 (GMT) |
| commit | ed9a540b2b351ea305e26bb0d9028f21c976b67c (patch) | |
| tree | c19318a20552a25360f54fcc3b4890fbe23d37de /sha1_file.c | |
| parent | 592ee97d8fffa2318960074057e044709163abf7 (diff) | |
| download | git-ed9a540b2b351ea305e26bb0d9028f21c976b67c.zip git-ed9a540b2b351ea305e26bb0d9028f21c976b67c.tar.gz git-ed9a540b2b351ea305e26bb0d9028f21c976b67c.tar.bz2 | |
merge-base: fully contaminate the well.
The discussion on the list demonstrated a pathological case where
an ancestor of a merge-base can be left interesting. This commit
introduces a postprocessing phase to fix it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'sha1_file.c')
0 files changed, 0 insertions, 0 deletions