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 /ppc | |
| parent | 57a2eee9250fadb72cb6bace963fd1ed683c83b8 (diff) | |
| parent | d795216ac35f08e1ae2a706fca4c06a887c7d797 (diff) | |
| download | git-d0d5ba7e6ed1f9ea7b22dc8063b782b431ad37b7.tar.gz | |
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 'ppc')
0 files changed, 0 insertions, 0 deletions