@matheusbsbs / matheus-bagliano / commits / c057b2424a

error_resolve_conflict: rewrap advice message

If you try to commit with unresolved conflicts in the index, you get this message: $ git commit U foo error: 'commit' is not possible because you have unmerged files. hint: Fix them up in the work tree, hint: and then use 'git add/rm <file>' as hint: appropriate to mark resolution and make a commit, hint: or use 'git commit -a'. fatal: Exiting because of an unresolved conflict. The irregular line-wrapping makes this awkward to read, and it takes up more lines than necessary. Instead, let's rewrap it to about 60 characters per line: $ git commit U foo error: 'commit' is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate to mark resolution and make a commit, or use hint: 'git commit -a'. fatal: Exiting because of an unresolved conflict. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Jun 3, 2014 at 03:17 UTC c057b2424a479a2219666f3806c0dd93867ca5c9

1 file changed +3 -4

advice.c

+3 -4

@@ -84,10 +84,9 @@ int error_resolve_conflict(const char *me)

84 * Message used both when 'git commit' fails and when

85 * other commands doing a merge do.

86 */

87 - advise(_("Fix them up in the work tree,\n"

88 - "and then use 'git add/rm <file>' as\n"

89 - "appropriate to mark resolution and make a commit,\n"

90 - "or use 'git commit -a'."));

87 + advise(_("Fix them up in the work tree, and then use 'git add/rm <file>'\n"

88 + "as appropriate to mark resolution and make a commit, or use\n"

89 + "'git commit -a'."));

90 return -1;

91 }