w-changeset: merge errors out

[John Dong]

Ok, I'll set my editor to do spaces for indenting from now on.

So what's next on the roadmap of changesets being merged into bzr? Your
implementation works very well in my testing this afternoon.

I guess my only other 'feature request' for changesets would be GPG
signing...

On 5/20/06, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
>
> John Dong wrote:
> > I think the following (gasp) changeset does the trick. (you know I'm
> > just finding an excuse to play with changesets)
>
> Thanks.  Applied.  We try to avoid using tabs, so I've re-indented it.
>
> Aaron
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20060520/3df09b7a/attachment.htm