Re: Continued work on sr/vcs-helper and sr/gfi-options
- From
Miklos Vajna <vmiklos@frugalware.org>
- Date
- Dec 6, 2009, 01:05 UTC
- Message-ID
- <20091206010548.GB31763@genesis.frugalware.org>
- In-Reply-To
- <fabb9a1e0912051653s77ba25e1g9ff1e21219cd06c9@mail.gmail.com>
On Sun, Dec 06, 2009 at 01:53:03AM +0100, Sverre Rabbelier <srabbelier@gmail.com> 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. :)