Merge branch 'jk/error-resolve-conflict-advice' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Jun 2014 20:36:14 +0000 (13:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Jun 2014 20:36:14 +0000 (13:36 -0700)
commit713ebe07345af4dc7f11c65d0e4fefc3af4d7818
treee647531d8b9aaa2ec8f4e3ac7b076d282012a6bd
parentabae695b7bbe8a8b321a1a632ca7a51008fe8248
parentd795216ac35f08e1ae2a706fca4c06a887c7d797
Merge branch 'jk/error-resolve-conflict-advice' into next

* jk/error-resolve-conflict-advice:
  error_resolve_conflict: drop quotations around operation
  error_resolve_conflict: rewrap advice message
advice.c