merge-{recursive,subtree}: use usagef() to print usage
authorJonathan Nieder <jrnieder@gmail.com>
Mon, 9 Nov 2009 15:05:03 +0000 (09:05 -0600)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Nov 2009 20:00:21 +0000 (12:00 -0800)
commit0874f46e711393b61f6375ab9e2cd4a0c2b812e9
tree8212cfca3cf83009c710fa3c1daeeba4b473abb4
parent64b1cb74f8312c0a43ce32f51097172efc69355a
merge-{recursive,subtree}: use usagef() to print usage

Usage messages (for example, from "git merge-recursive -h") are
friendlier when not preceded by "fatal".

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-merge-recursive.c