On Sun, Dec 06, 2009 at 01:53:03AM +0100, Sverre Rabbelier <srabbelier@xxxxxxxxx> wrote: > (with a three-way merge), but I'm not sure? Also, when I try to rebase > sr/vcs-helper onto master I get conflicts yet again, since these were That part is fairly easy, just don't forget to enable rerere. :)
Attachment:
pgphbtidYLVXR.pgp
Description: PGP signature