diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-08-09 20:43:03 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-10 01:54:00 +0400 |
| commit | 934d9a24078e65111e9946ad3449c3fa9c06475e (patch) | |
| tree | 2d3c0a364e51a392785bde9508efcede26543828 /pkt-line.h | |
| parent | c1964a006f9035cbdc6de8e55768fc6ad00d4825 (diff) | |
merge-recur: if there is no common ancestor, fake empty one
This fixes the coolest merge ever.
[jc: with two "Oops that's not it" fixes from Johannes and Alex,
and an obvious type mismatch fix.]
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'pkt-line.h')
0 files changed, 0 insertions, 0 deletions