From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Aug 2008 00:28:31 +0000 (-0700)
Subject: Merge branch 'mv/merge-custom'
X-Git-Tag: v1.6.1-rc1~294
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a1184d85e8752658f02746982822f43f32316803;p=git.git

Merge branch 'mv/merge-custom'

* mv/merge-custom:
  t7606: fix custom merge test
  Fix "git-merge -s bogo" help text
  Update .gitignore to ignore git-help
  Builtin git-help.
  builtin-help: always load_command_list() in cmd_help()
  Add a second testcase for handling invalid strategies in git-merge
  Add a new test for using a custom merge strategy
  builtin-merge: allow using a custom strategy
  builtin-help: make some internal functions available to other builtins

Conflicts:
	help.c
---

a1184d85e8752658f02746982822f43f32316803