From: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu, 28 Oct 2010 00:01:15 GMT
Subject: Re: Detect merge/rebase conflicts without changing the worktree?
Message-ID: <20101028000115.GC30490@burratino>
In-Reply-To: <AANLkTikuyGcK-j_hT2WxJiYVX784nPehZS8=F05N_eGQ@mail.gmail.com>

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".