diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-30 00:09:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-30 00:09:36 -0700 |
| commit | a059240f06967f485e0a094e220bae73a746ed24 (patch) | |
| tree | 25c5314f1192176306f4fe14f2d533d8b4a8ab34 /Documentation/git-merge-tree.txt | |
| parent | bcb477fb60dc3e7c75a0c2870b106afeb21ae5d2 (diff) | |
| parent | f5799e05c0e7fbee32ca32995c7c4a627eeff469 (diff) | |
| download | git-a059240f06967f485e0a094e220bae73a746ed24.tar.gz git-a059240f06967f485e0a094e220bae73a746ed24.tar.xz | |
Merge branch 'bc/maint-submodule-fix-parked' into maint
* bc/maint-submodule-fix-parked:
git-submodule.sh: separate parens by a space to avoid confusing some shells
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions