diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-03 13:39:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-03 13:39:03 -0700 |
| commit | 38245956648c54d138efc7b95b450dc7203e2a2f (patch) | |
| tree | 7cd5d4ef84f71587cc35f3dade01b1340eba9943 /csum-file.c | |
| parent | 9c7d0cc62f10d4945e665614ca836a4a5c81593c (diff) | |
| parent | 3c3e6f5645c5e661bc8c338e4e7a9252a14e429e (diff) | |
| download | git-38245956648c54d138efc7b95b450dc7203e2a2f.tar.gz git-38245956648c54d138efc7b95b450dc7203e2a2f.tar.xz | |
Merge branch 'rr/doc-merge-strategies' into maint
* rr/doc-merge-strategies:
Documentation/merge-strategies: avoid hyphenated commands
Diffstat (limited to 'csum-file.c')
0 files changed, 0 insertions, 0 deletions