From: Klas Lindberg <klas.lindberg@gmail.com>
Date: Thu, 28 Oct 2010 10:01:34 GMT
Subject: Re: Detect merge/rebase conflicts without changing the worktree?
Message-ID: <AANLkTim8X1nwgMPLWme6s0KRUCZVDzUPYhgSbkrChN6D@mail.gmail.com>
In-Reply-To: <20101028000115.GC30490@burratino>

Thank you. I don't know how I missed that one  :-~

On Thu, Oct 28, 2010 at 2:01 AM, Jonathan Nieder <jrnieder@gmail.com> wrote:
> Hi Klas,
>
> Klas Lindberg wrote:
>
>> What is the recommended way to detect merge/rebase conflicts without
>> actually modifying the worktree?
>
> You might like "git merge-tree".
>