error_resolve_conflict: drop quotations around operation
authorJeff King <peff@peff.net>
Tue, 3 Jun 2014 07:23:49 +0000 (03:23 -0400)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2014 17:04:21 +0000 (10:04 -0700)
commitd795216...c35f08e1ae2a706fca4c06a887c7d797
tree4a84343...db1eee9375e98ad27ed4dd8c1fb01044copy hash to clipboard (tree)
parentc057b24...4a479a2219666f3806c0dd93867ca5c9copy hash to clipboard (diff)
advice.c