diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-16 14:33:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-16 14:33:52 -0700 |
| commit | 0d9388dc30717a5780fa84befa03bef56884805a (patch) | |
| tree | 70d856d042df10d4ea208272acda2fdc0dfca6be /Documentation/merge-strategies.txt | |
| parent | 6de4c808391ffff01185c093d6c46f2861f48862 (diff) | |
| parent | ec48a76306091abfa7831a97f36949ab82432ddc (diff) | |
| download | git-0d9388dc30717a5780fa84befa03bef56884805a.tar.gz git-0d9388dc30717a5780fa84befa03bef56884805a.tar.xz | |
Merge branch 'sb/submodule-doc-intro' into maint
* sb/submodule-doc-intro:
submodule doc: reorder introductory paragraphs
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions