diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-31 12:00:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-31 12:00:43 -0700 |
| commit | 82ca09090ef0615732a53e2d07414382ca8d1fe4 (patch) | |
| tree | c9b74b0b11e5efff76c8c09c18369c1ca1ab251e /git-merge-octopus.sh | |
| parent | dd4c0ce908f4ea89375aefb5566d4bf9ec21db5c (diff) | |
| parent | 72942a617cb1f6e1844a7391d030c15acd2ca052 (diff) | |
| download | git-82ca09090ef0615732a53e2d07414382ca8d1fe4.tar.gz git-82ca09090ef0615732a53e2d07414382ca8d1fe4.tar.xz | |
Merge branch 'ml/test-readme' into maint
* ml/test-readme:
t/README: unify documentation of test function args
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions