tree f9dc267857e5939b6179cd1b245968eb37ed4f81
parent 22da742982eeeb95b6fb4cd757509a8c4c2202d8
author Thiago Farina <tfransosi@gmail.com> 1283139022 -0300
committer Junio C Hamano <gitster@pobox.com> 1283531830 -0700

builtin/merge_recursive.c: Add an usage string and make use of it.

This improves the usage output by adding builtin_merge_recursive_usage string
that follows the same pattern used by the other builtin commands.

The previous output for git merger-recursive was:
usage: merge-recursive <base>... -- <head> <remote> ...

Now the output is:
usage: git merge-recursive <base>... -- <head> <remote> ...

Since cmd_merge_recursive is used to handle four different commands we need
the %s in the usage string, so the following example:

$ git merge-subtree -h

Will output:
usage: git merge-subtree <base>... -- <head> <remote> ...

Signed-off-by: Thiago Farina <tfransosi@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>