| commit | f3f8af0e54a31ffed242dc36482f82393f596ee5 | |
| author | Vikrant Varma <vikrant.varma94@gmail.com> | |
| Sat, 4 May 2013 00:04:20 +0000 (4 05:34 +0530) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 8 May 2013 22:34:33 +0000 (8 15:34 -0700) | ||
| tree | 699c87d896204edf74e27673c660e67adee798e4 | treesnapshot (tar.gz zip) |
| parent | e56181060e1117d458b854c34e63206117dab8b6 | commitdiff |
merge: use help_unknown_ref()
Use help.c:help_unknown_ref() instead of die() to provide a
friendlier error message before exiting, when one of the refs
specified in a merge is unknown.
Signed-off-by: Vikrant Varma <vikrant.varma94@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Use help.c:help_unknown_ref() instead of die() to provide a
friendlier error message before exiting, when one of the refs
specified in a merge is unknown.
Signed-off-by: Vikrant Varma <vikrant.varma94@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge.c | diffblobblamehistory |