Files
git/git-merge.sh
Junio C Hamano 581a121d8a Merge branch 'sp/merge-recursive' into next
* sp/merge-recursive:
  Convert output messages in merge-recursive to past tense.
  Display a progress meter during merge-recursive.
  Enable output buffering in merge-recursive.
  Allow the user to control the verbosity of merge-recursive.
  Remove unnecessary call_depth parameter in merge-recursive.
  Remove read_or_die in favor of better error messages.
  Hide output about SVN::Core not being found during tests.
  simplify the "no changes added to commit" message
  Allow whole-tree operations to be started from a subdirectory
2007-01-14 12:21:08 -08:00

12 KiB
Executable File