error_resolve_conflict: rewrap advice message
authorJeff King <peff@peff.net>
Tue, 3 Jun 2014 07:17:17 +0000 (03:17 -0400)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2014 17:04:19 +0000 (10:04 -0700)
commitc057b24...4a479a2219666f3806c0dd93867ca5c9
treea3bb139...144ddcde15d4ba7b79e36a3eacf51968copy hash to clipboard (tree)
parent7bbc4e8...db33e0a8e42e77cc05460d4c4f615f4dcopy hash to clipboard (diff)
advice.c