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
Junio C Hamano committed
Jun 16, 2014 at 12:18 UTC
d0d5ba7e6ed1f9ea7b22dc8063b782b431ad37b7
No changes.