Re: Continued work on sr/vcs-helper and sr/gfi-options

On Sun, Dec 06, 2009 at 01:53:03AM +0100, Sverre Rabbelier [off-list ref] 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. :)