diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-04-03 10:29:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-03 10:29:27 -0700 |
| commit | 3b8c4b727f389e3470ec31b20e2a97496da36086 (patch) | |
| tree | 5e188d15dfcd64a2504b31cd8a2d479ebc6fddd3 /mergetools/vimdiff2 | |
| parent | Merge branch 'jk/rev-parse-local-env-vars' (diff) | |
| parent | lockfile: improve error message when lockfile exists (diff) | |
| download | tgif-3b8c4b727f389e3470ec31b20e2a97496da36086.tar.xz | |
Merge branch 'mm/lockfile-error-message'
* mm/lockfile-error-message:
lockfile: improve error message when lockfile exists
lockfile: mark strings for translation
Diffstat (limited to 'mergetools/vimdiff2')
0 files changed, 0 insertions, 0 deletions