Re: [PATCH v2 4/5] Make sure to use Araxis' "compare" and not e.g. ImageMagick's

2012-07-23 Thread Junio C Hamano
Sebastian Schuberth writes: > Signed-off-by: Sebastian Schuberth > --- > mergetools/araxis | 8 +++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/mergetools/araxis b/mergetools/araxis > index 64f97c5..aeba1b9 100644 > --- a/mergetools/araxis > +++ b/mergetools/araxis >

[PATCH v2 4/5] Make sure to use Araxis' "compare" and not e.g. ImageMagick's

2012-07-23 Thread Sebastian Schuberth
Signed-off-by: Sebastian Schuberth --- mergetools/araxis | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mergetools/araxis b/mergetools/araxis index 64f97c5..aeba1b9 100644 --- a/mergetools/araxis +++ b/mergetools/araxis @@ -16,5 +16,11 @@ merge_cmd () { } translate