better handling of merge conflicts
authorRudolf Polzer <rpolzer@grawp.(none)>
Fri, 2 Apr 2010 19:11:17 +0000 (21:11 +0200)
committerRudolf Polzer <rpolzer@grawp.(none)>
Fri, 2 Apr 2010 19:11:17 +0000 (21:11 +0200)
commit592d77dbf05125078c51b336b69bfdf19b2ee167
tree4ba690daaa40ea227dfaaaac6a773555cbe7b668
parenta93d716530f59cce4f56cfc0fc5326998fee954d
better handling of merge conflicts
all