From: Nicolas Pitre <nico@cam.org>
Date: Tue, 30 Oct 2007 19:59:24 +0000 (-0400)
Subject: cherry-pick/revert: more compact user direction message
X-Git-Tag: v1.5.3.5~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/04bd8e5fea48a00816b461b0fb934627cfd2c45f?hp=04bd8e5fea48a00816b461b0fb934627cfd2c45f

cherry-pick/revert: more compact user direction message

A failed cherry-pick (and friend) currently says:

|Automatic cherry-pick failed.  After resolving the conflicts,
|mark the corrected paths with 'git-add <paths>'
|and commit the result.

This can obviously be displayed on two lines only.
While at it, change "git-add" to "git add".

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---