diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-22 13:10:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-22 13:10:19 -0800 |
| commit | fa7b63d2f142bec8fe0568761e1c9c22ec877bca (patch) | |
| tree | 32def7720cd9f4c362b9ddccf7efba04979aa308 /Documentation/git-merge-one-file.txt | |
| parent | 8a71d90b7e6bcf88232e34c77560dd3d0b334247 (diff) | |
| parent | f562d7de32fe4202c3d0d245b87fe671011ad698 (diff) | |
| download | git-fa7b63d2f142bec8fe0568761e1c9c22ec877bca.tar.gz git-fa7b63d2f142bec8fe0568761e1c9c22ec877bca.tar.xz | |
Merge branch 'ah/stripspace-optstring' into maint
* ah/stripspace-optstring:
stripspace: call U+0020 a "space" instead of a "blank"
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions