Comment 3 for bug 254449

Revision history for this message
Berto (bertosmailbox) wrote :

I'm not sure if this is the best way to do it, but I've put together a patch that checks for uncommitted changes before doing much other work in the merge command:

http://bazaar.launchpad.net/~bertosmailbox/bzr/bzr/revision/4038

This branch is located at:

lp:~bertosmailbox/bzr/bzr

Any comments are welcome, thanks!