diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-12-05 09:20:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-05 09:20:12 -0800 |
| commit | 77e422439014eca6d898107106f1758a0ffd6058 (patch) | |
| tree | 4ff21484291256dcf09595e2ec2ec46a8a949c51 /Documentation/git-merge-tree.txt | |
| parent | Sync with v2.15.1 (diff) | |
| parent | git-gui: prevent double UTF-8 conversion (diff) | |
| download | tgif-77e422439014eca6d898107106f1758a0ffd6058.tar.xz | |
Merge branch 'ls/no-double-utf8-author-name' of ../git-gui into ls/git-gui-no-double-utf8-author-name
* 'ls/no-double-utf8-author-name' of ../git-gui:
git-gui: prevent double UTF-8 conversion
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions