diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-30 00:43:13 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-30 00:43:13 +0400 |
| commit | 934747323c397ffe64b6dcdf2bf73128d8e36968 (patch) | |
| tree | a02906b87b716d48d56b9b0de209fe02da65969e /git-merge-octopus.sh | |
| parent | 3e73cb2f48cc4044905455a9936692f967a0f9b3 (diff) | |
| parent | 7dae8b21c2fe39a59661c709f0dc17090dafa5a4 (diff) | |
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0:
diff -c -p: do not die on submodules
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions