From: Christian Couder <christian.couder@gmail.com>
Date: Mon, 11 Aug 2014 18:57:53 GMT
Subject: Re: Sharing merge conflict resolution between multiple developers
Message-ID: <CAP8UFD27qHqHx4ZPw=Fyn0R9NWqhuiespDHnDi=z=1nKb=wKtg@mail.gmail.com>
In-Reply-To: <CAP8UFD0_zfB_D-9EVZ4K=Zdq_G+9C-QhX7WED53zExV+Nv8Arg@mail.gmail.com>

Le 11 août 2014 07:50, "Christian Couder" <christian.couder@gmail.com> a écrit :
>
> This should be possible using "git imerge" which is separate tool.

Sorry I sent the above using the gmail app on my mobile phone and
unfortunately I can't make it send plain text emails.
(Emails which are not plain text are rejected by vger.kernel.org.)

Best,
Christian.