diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-06-23 10:43:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-23 10:43:28 -0700 |
| commit | ba4d01bd74edae1e4adb540a03ba17961f8dd4b2 (patch) | |
| tree | 3cc1e3001c8fbaa2677388c4456c00ba3037870a /Documentation/git-merge.txt | |
| parent | Update draft release notes to 1.7.2 (diff) | |
| parent | url.c: "<scheme>://" part at the beginning should not be URL decoded (diff) | |
| download | tgif-ba4d01bd74edae1e4adb540a03ba17961f8dd4b2.tar.xz | |
Merge branch 'jk/url-decode'
* jk/url-decode:
url.c: "<scheme>://" part at the beginning should not be URL decoded
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions