diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-05-08 15:59:34 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 15:59:34 +0900 |
| commit | 71c848bb28a2fcef918178f286f7e43d9804588d (patch) | |
| tree | 3dce8d79ffa6e3cd81d9076afb59d9b3a878c93c /Documentation/git-merge-index.txt | |
| parent | Merge branch 'js/colored-push-errors' (diff) | |
| parent | Avoid multiple PREFIX definitions (diff) | |
| download | tgif-71c848bb28a2fcef918178f286f7e43d9804588d.tar.xz | |
Merge branch 'js/runtime-prefix'
* js/runtime-prefix:
Avoid multiple PREFIX definitions
git_setup_gettext: plug memory leak
gettext: avoid initialization if the locale dir is not present
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions