Re: [PATCH 2/2] git-gui: support for diff3 conflict style

2019-10-04 Thread Philip Oakley
On 04/10/2019 16:22, Bert Wesarg wrote: On Thu, Oct 3, 2019 at 11:40 PM Philip Oakley wrote: On 03/10/2019 21:54, Pratyush Yadav wrote: My only remaining bikeshed question it prompted was to check which parts would be committed as part of committing the whole "hunk". But haven't had time to lo

Re: [PATCH 2/2] git-gui: support for diff3 conflict style

2019-10-03 Thread Philip Oakley
On 03/10/2019 21:54, Pratyush Yadav wrote: My only remaining bikeshed question it prompted was to check which parts would be committed as part of committing the whole "hunk". But haven't had time to look at all! I'm not sure what you mean by "committing the whole hunk". In a merge conflict state

Re: [PATCH 2/2] git-gui: support for diff3 conflict style

2019-10-03 Thread Pratyush Yadav
On 03/10/19 09:02PM, Philip Oakley wrote: > On 30/09/2019 13:17, Bert Wesarg wrote: > > Pratyush, > > > > On Sun, Sep 29, 2019 at 5:04 PM Pratyush Yadav > > wrote: > > > Hi Philip, Bert, > > > > > > Is there any way I can test this change? Philip, I ran the rebase you > > > mention in the GitHu

Re: [PATCH 2/2] git-gui: support for diff3 conflict style

2019-10-03 Thread Philip Oakley
On 30/09/2019 13:17, Bert Wesarg wrote: Pratyush, On Sun, Sep 29, 2019 at 5:04 PM Pratyush Yadav wrote: Hi Philip, Bert, Is there any way I can test this change? Philip, I ran the rebase you mention in the GitHub issue [0], and I get that '9c8cba6862abe5ac821' is an unknown revision. Is ther

Re: [PATCH 2/2] git-gui: support for diff3 conflict style

2019-09-30 Thread Bert Wesarg
Pratyush, On Sun, Sep 29, 2019 at 5:04 PM Pratyush Yadav wrote: > > Hi Philip, Bert, > > Is there any way I can test this change? Philip, I ran the rebase you > mention in the GitHub issue [0], and I get that '9c8cba6862abe5ac821' is > an unknown revision. > > Is there any quick way I can reprodu

Re: [PATCH 2/2] git-gui: support for diff3 conflict style

2019-09-29 Thread Pratyush Yadav
Hi Philip, Bert, Is there any way I can test this change? Philip, I ran the rebase you mention in the GitHub issue [0], and I get that '9c8cba6862abe5ac821' is an unknown revision. Is there any quick way I can reproduce this (maybe on a sample repo)? [0] https://github.com/git-for-windows/git/

[PATCH 2/2] git-gui: support for diff3 conflict style

2019-09-25 Thread Bert Wesarg
This adds highlight support for the diff3 conflict style. The common pre-image will be reversed to --, because it has been removed and either replaced with ours or theirs side. Signed-off-by: Bert Wesarg --- git-gui.sh | 3 +++ lib/diff.tcl | 22 ++ 2 files changed, 25 in