Re: git: regression with mergetool and answering "n" (backport fix / add tests)

2015-01-23 Thread Daniel Hahler
Hi, I am a bit surprised that this bug still exists in "maint" / v2.2.2. Cherry-picking/merging 0ddedd4 fixes it. Regards, Daniel. On 26.12.2014 02:12, Daniel Hahler wrote: > Hi David, > > sorry for the confusion - the patch / fix I've mentioned was meant to be > applied on the commit that ca

Re: git: regression with mergetool and answering "n" (backport fix / add tests)

2014-12-25 Thread Daniel Hahler
Hi David, sorry for the confusion - the patch / fix I've mentioned was meant to be applied on the commit that caused the regression and not current master. Cheers, Daniel. On 26.12.2014 02:00, David Aguilar wrote: > On Tue, Dec 23, 2014 at 08:08:34PM +0100, Daniel Hahler wrote: >> Hi, >> >> thi

Re: git: regression with mergetool and answering "n" (backport fix / add tests)

2014-12-25 Thread David Aguilar
On Tue, Dec 23, 2014 at 08:08:34PM +0100, Daniel Hahler wrote: > Hi, > > this is in reply to the commits from David: > > commit 0ddedd4d6b9b3e8eb3557d8ed28e1a0b354a25f8 > Refs: v2.2.0-60-g0ddedd4 > Merge: e886efd 1e86d5b > Author: Junio C Hamano > AuthorDate: Fri Dec 12 1

git: regression with mergetool and answering "n" (backport fix / add tests)

2014-12-23 Thread Daniel Hahler
Hi, this is in reply to the commits from David: commit 0ddedd4d6b9b3e8eb3557d8ed28e1a0b354a25f8 Refs: v2.2.0-60-g0ddedd4 Merge: e886efd 1e86d5b Author: Junio C Hamano AuthorDate: Fri Dec 12 14:31:39 2014 -0800 Commit: Junio C Hamano CommitDate: Fri Dec 12 14: