Merge branch 'jk/error-resolve-conflict-advice'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 19:18:47 +0000 (12:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 19:18:47 +0000 (12:18 -0700)
commitd0d5ba7e6ed1f9ea7b22dc8063b782b431ad37b7
treefca3696ac31cb6e0d912200d59eb036107dfba9e
parent57a2eee9250fadb72cb6bace963fd1ed683c83b8
parentd795216ac35f08e1ae2a706fca4c06a887c7d797
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
advice.c