diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-06-17 11:40:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-17 11:40:32 -0700 |
| commit | 179aae51bbaa86bd64bbb520f15e6126c92f3f4d (patch) | |
| tree | bb01ae4a7f76683117459b5ea6dbf9b052c1e909 /Documentation/howto/revert-a-faulty-merge.txt | |
| parent | Git 1.7.6-rc2 (diff) | |
| parent | sh-i18n--envsubst.c: do not #include getopt.h (diff) | |
| download | tgif-179aae51bbaa86bd64bbb520f15e6126c92f3f4d.tar.xz | |
Merge branch 'ab/i18n-scripts-basic'
* ab/i18n-scripts-basic:
sh-i18n--envsubst.c: do not #include getopt.h
Diffstat (limited to 'Documentation/howto/revert-a-faulty-merge.txt')
0 files changed, 0 insertions, 0 deletions