diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-07-06 21:29:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-06 21:29:21 -0700 |
| commit | 78db709ae59da26de76264b79df3a7dc4d87e65c (patch) | |
| tree | e96f2af98f008112b74b3c7649ff723e8a1160ed /git-merge-octopus.sh | |
| parent | Merge branch 'maint' (diff) | |
| parent | add missing && to submodule-merge testcase (diff) | |
| download | tgif-78db709ae59da26de76264b79df3a7dc4d87e65c.tar.xz | |
Merge branch 'maint'
* maint:
add missing && to submodule-merge testcase
test-date: fix sscanf type conversion
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions