From: Tom Clarke <tom@u2i.com>
Date: Thu, 30 Aug 2007 19:36:14 GMT
Subject: Re: [PATCH] Adding rebase merge strategy
Message-ID: <550f9510708301236y65a9952dofbd69417dc1310ee@mail.gmail.com>
In-Reply-To: <11885023904126-git-send-email-tom@u2i.com>

On 8/30/07, Tom Clarke <tom@u2i.com> wrote:
> +               ( git log --pretty=format:"%s" ) >actual &&
> +       (
> +               echo "onbranch"
> +               echo "update"
> +               echo -n "initial"
> +       ) >expected &&
> +       git diff -w -u expected actual

One issue that I'm curious about. Is it expected that the git log
format above doesn't finish with a new line? I couldn't get this test
to work otherwise.

-Tom