tree 4075d54c2ceda33c5ce6c45950ba4bc8af041822
parent 58995b5b860bc84b7d726c0e5b2007a02a7c33ae
author Vincent Driessen <vincent@datafox.nl> 1264678833 +0100
committer Vincent Driessen <vincent@datafox.nl> 1264765264 +0100

Initial implementation of merge conflict resolution support.