| commit | d0d5ba7e6ed1f9ea7b22dc8063b782b431ad37b7 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Jun 2014 19:18:47 +0000 (16 12:18 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Jun 2014 19:18:47 +0000 (16 12:18 -0700) | ||
| tree | fca3696ac31cb6e0d912200d59eb036107dfba9e | treesnapshot (tar.gz zip) |
| parent | 57a2eee9250fadb72cb6bace963fd1ed683c83b8 | commitdiff |
| parent | d795216ac35f08e1ae2a706fca4c06a887c7d797 | commitdiff |
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
* jk/error-resolve-conflict-advice:
error_resolve_conflict: drop quotations around operation
error_resolve_conflict: rewrap advice message
| advice.c | diff1 | diff2 | blobhistory |