Signed-off-by: Junio C Hamano <gitster@pobox.com>

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>

Signed-off-by: Junio C Hamano <gitster@pobox.com>

* gp/pack-refs-remove-empty-dirs:
  pack-refs: remove newly empty directories

* sg/rerere-gc-old-still-used:
  rerere: fix overeager gc
  mingw_utime(): handle NULL times parameter

* np/maint-huge-delta-generation:
  fix >4GiB source delta assertion failure

* dj/fetch-tagopt:
  fetch: allow command line --tags to override config

* da/fix-submodule-sync-superproject-config:
  submodule sync: Update "submodule.<name>.url"

* en/rebase-against-rebase-fix:
  pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches
  t5520-pull: Add testcases showing spurious conflicts from git pull --rebase

* maint-1.7.1:
  t0003: add missing && at end of lines