Re: [PATCH 01/16] merge: simplify ff-only option

2013-10-31 Thread Junio C Hamano
Felipe Contreras writes: > No functional changes. > > Signed-off-by: Felipe Contreras > --- > builtin/merge.c | 11 ++- > 1 file changed, 2 insertions(+), 9 deletions(-) > > diff --git a/builtin/merge.c b/builtin/merge.c > index 02a69c1..41fb66d 100644 > --- a/builtin/merge.c > +++ b/bu

[PATCH 01/16] merge: simplify ff-only option

2013-10-31 Thread Felipe Contreras
No functional changes. Signed-off-by: Felipe Contreras --- builtin/merge.c | 11 ++- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index 02a69c1..41fb66d 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -186,13 +186,6 @@ static int o