Comment 2 for bug 417210

Revision history for this message
legendarydrew (headdy) wrote : Re: error message when using TortoiseBZR to commit

Yes, that happens when I've tried to commit just a few files - committing the whole tree works.
However, I wasn't aware that I did a merge. What happened was I did an update from an SVN repository, which resulted in a file conflict.