./all - handle upstream rebase better (abort, instead of causing a frankenstein merge)
authorRudolf Polzer <rpolzer@grawp.(none)>
Sat, 10 Apr 2010 16:05:46 +0000 (18:05 +0200)
committerRudolf Polzer <rpolzer@grawp.(none)>
Sat, 10 Apr 2010 16:05:46 +0000 (18:05 +0200)
commitf5bb6ca67804006b762fa17020fb040dac789a13
tree5031317124fbab557d4dfde15fcabff5109b1968
parent2e2d41c6bae5b01774ffc793f650e762fe297561
./all - handle upstream rebase better (abort, instead of causing a frankenstein merge)
all