Re: [PATCH 2/2] mergetools/tortoisemerge: simplify can_diff() by using "false"

2016-12-12 Thread Philip Oakley
From: "David Aguilar" On Sat, Dec 10, 2016 at 09:15:34AM +0100, Johannes Sixt wrote: Am 10.12.2016 um 04:21 schrieb David Aguilar: > Signed-off-by: David Aguilar > --- > This patch builds upon da/mergetool-trust-exit-code > > mergetools/tortoisemerge | 2 +- > 1 file changed, 1 insertion(+),

Re: [PATCH 2/2] mergetools/tortoisemerge: simplify can_diff() by using "false"

2016-12-11 Thread David Aguilar
On Sat, Dec 10, 2016 at 09:15:34AM +0100, Johannes Sixt wrote: > Am 10.12.2016 um 04:21 schrieb David Aguilar: > > Signed-off-by: David Aguilar > > --- > > This patch builds upon da/mergetool-trust-exit-code > > > > mergetools/tortoisemerge | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(

Re: [PATCH 2/2] mergetools/tortoisemerge: simplify can_diff() by using "false"

2016-12-10 Thread Johannes Sixt
Am 10.12.2016 um 04:21 schrieb David Aguilar: Signed-off-by: David Aguilar --- This patch builds upon da/mergetool-trust-exit-code mergetools/tortoisemerge | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mergetools/tortoisemerge b/mergetools/tortoisemerge index d7ab666a59..

[PATCH 2/2] mergetools/tortoisemerge: simplify can_diff() by using "false"

2016-12-09 Thread David Aguilar
Signed-off-by: David Aguilar --- This patch builds upon da/mergetool-trust-exit-code mergetools/tortoisemerge | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mergetools/tortoisemerge b/mergetools/tortoisemerge index d7ab666a59..9067d8a4e5 100644 --- a/mergetools/tortoisemerge