diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-04-29 15:40:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-29 15:40:33 -0700 |
| commit | a2dc04ba159def766ee17db00c60bdbda477955d (patch) | |
| tree | 961c12266b9374cd9eaa40b668ad3b897845d99c /t/t7405-submodule-merge.sh | |
| parent | Merge branch 'maint-1.6.1' into maint (diff) | |
| parent | Merge branch 'maint-1.6.0' into maint-1.6.1 (diff) | |
| download | tgif-a2dc04ba159def766ee17db00c60bdbda477955d.tar.xz | |
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1:
diff -c -p: do not die on submodules
Diffstat (limited to 't/t7405-submodule-merge.sh')
0 files changed, 0 insertions, 0 deletions