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)
* jk/error-resolve-conflict-advice:
  error_resolve_conflict: drop quotations around operation
  error_resolve_conflict: rewrap advice message

1  2 
advice.c

diff --cc advice.c
Simple merge