tree fca3696ac31cb6e0d912200d59eb036107dfba9e
parent 57a2eee9250fadb72cb6bace963fd1ed683c83b8
parent d795216ac35f08e1ae2a706fca4c06a887c7d797
author Junio C Hamano <gitster@pobox.com> 1402946327 -0700
committer Junio C Hamano <gitster@pobox.com> 1402946327 -0700

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