[PATCH 2/2] merge: use help_unknown_ref instead of die

2013-05-01 Thread Vikrant Varma
The previous patch added help_unknown_ref to print a more helpful error message when trying to merge a branch that doesn't exist, by printing a list of remote branches the user might have meant. Use it. Signed-off-by: Vikrant Varma --- builtin/merge.c | 4 ++-- 1 file changed, 2 insertions(+),

Re: [PATCH 2/2] merge: use help_unknown_ref instead of die

2013-05-01 Thread Junio C Hamano
Vikrant Varma writes: > The previous patch added help_unknown_ref to print a more helpful error > message when trying to merge a branch that doesn't exist, by printing a > list of remote branches the user might have meant. Use it. > > Signed-off-by: Vikrant Varma > --- > builtin/merge.c | 4 +