diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-24 13:48:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-24 13:48:53 -0700 |
| commit | 6f37238747002b8118d92bc0ec6c986a5d7e56ad (patch) | |
| tree | 40076791f6955066ea0d7c69cc176a13f17d4e0e /Documentation/git-sh-i18n.txt | |
| parent | c47d4380c7972bf94bd5ee425c3806398e00cb4d (diff) | |
| parent | d2512fc94fe75d8836a6fc965951d8180dbddbe6 (diff) | |
| download | git-6f37238747002b8118d92bc0ec6c986a5d7e56ad.tar.gz | |
Merge branch 'jk/mergetool-lib-refactor'
Code cleanup.
* jk/mergetool-lib-refactor:
mergetool--lib: refactor {diff,merge}_cmd logic
Diffstat (limited to 'Documentation/git-sh-i18n.txt')
0 files changed, 0 insertions, 0 deletions