Alex Riesen, Thu, Mar 29, 2007 20:32:37 +0200: > > The structure looks like this: > > o---o-o-o---o-o-o-o-o > \ ____\_/ > \ / \ > o-------o-o-o-o > And this is a repo (reconstructed, not the original, of course) which shows the problem. Just run "git merge merge" while on master.
Attachment:
rec-crash.tar.bz2
Description: Binary data