From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Jun 2014 19:18:47 +0000 (-0700)
Subject: Merge branch 'jk/error-resolve-conflict-advice'
X-Git-Tag: v2.1.0-rc0~107
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d0d5ba7e6ed1f9ea7b22dc8063b782b431ad37b7?ds=inline;hp=--cc

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
---

d0d5ba7e6ed1f9ea7b22dc8063b782b431ad37b7