diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-08-27 17:28:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-27 17:28:31 -0700 |
| commit | a1184d85e8752658f02746982822f43f32316803 (patch) | |
| tree | f4508ca7d63ca7e71c3e99cac4e54945f777b1aa /t/t4013/diff.format-patch_--inline_--stdout_initial..side | |
| parent | Merge branch 'ml/submodule' (diff) | |
| parent | t7606: fix custom merge test (diff) | |
| download | tgif-a1184d85e8752658f02746982822f43f32316803.tar.xz | |
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
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..side')
0 files changed, 0 insertions, 0 deletions