diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-06-16 12:18:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-16 12:18:47 -0700 |
| commit | d0d5ba7e6ed1f9ea7b22dc8063b782b431ad37b7 (patch) | |
| tree | fca3696ac31cb6e0d912200d59eb036107dfba9e /archive-zip.c | |
| parent | Merge branch 'rs/pack-objects-no-unnecessary-realloc' (diff) | |
| parent | error_resolve_conflict: drop quotations around operation (diff) | |
| download | tgif-d0d5ba7e6ed1f9ea7b22dc8063b782b431ad37b7.tar.xz | |
Merge branch 'jk/error-resolve-conflict-advice'
* jk/error-resolve-conflict-advice:
error_resolve_conflict: drop quotations around operation
error_resolve_conflict: rewrap advice message
Diffstat (limited to 'archive-zip.c')
0 files changed, 0 insertions, 0 deletions