diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-06-03 12:06:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-03 12:06:44 -0700 |
| commit | e3798318b12502ae13a8e35e4a385665e810047f (patch) | |
| tree | d8fb6d6d05afc33a7ad37b54ef9caf142da46a63 /mergetools/gvimdiff2 | |
| parent | Merge branch 'sk/tag-contains-wo-recursion' (diff) | |
| parent | git-remote-mediawiki: fix encoding issue for UTF-8 media files (diff) | |
| download | tgif-e3798318b12502ae13a8e35e4a385665e810047f.tar.xz | |
Merge branch 'mm/mediawiki-encoding-fix'
* mm/mediawiki-encoding-fix:
git-remote-mediawiki: fix encoding issue for UTF-8 media files
git-remote-mediawiki: allow stop/start-ing the test server
Diffstat (limited to 'mergetools/gvimdiff2')
0 files changed, 0 insertions, 0 deletions