summaryrefslogtreecommitdiff
path: root/builtin-fmt-merge-msg.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-02-24 01:05:27 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2007-02-24 01:06:19 -0800
commitb1440cc8060e79f885691ebeae7ce033bd606a7c (patch)
tree3814718e45ebb948d423e24c41ca71fd565be12a /builtin-fmt-merge-msg.c
parentLimit filename for format-patch (diff)
downloadtgif-b1440cc8060e79f885691ebeae7ce033bd606a7c.tar.xz
Reword git-am 3-way fallback failure message.
When the blobs recorded on the index lines in the patch as pre-image blobs are not found in the repository, "git-am" punted saying that the index line does not record anything useful. This was not clear enough -- the index line does have something useful but the problem was that it was not useful in _that_ repository. Reword the message as Francis Moreau suggests. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions