| commit | 38245956648c54d138efc7b95b450dc7203e2a2f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 3 Apr 2014 20:39:03 +0000 (3 13:39 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 3 Apr 2014 20:39:03 +0000 (3 13:39 -0700) | ||
| tree | 7cd5d4ef84f71587cc35f3dade01b1340eba9943 | treesnapshot (tar.gz zip) |
| parent | 9c7d0cc62f10d4945e665614ca836a4a5c81593c | commitdiff |
| parent | 3c3e6f5645c5e661bc8c338e4e7a9252a14e429e | commitdiff |
Merge branch 'rr/doc-merge-strategies' into maint
* rr/doc-merge-strategies:
Documentation/merge-strategies: avoid hyphenated commands
* rr/doc-merge-strategies:
Documentation/merge-strategies: avoid hyphenated commands
| Documentation/merge-strategies.txt | diff1 | diff2 | blobhistory |