From: Jonathan del Strother <maillist@steelskies.com>
Date: Fri, 22 Aug 2008 17:18:44 +0000 (+0100)
Subject: Revert "Convert output messages in merge-recursive to past tense."
X-Git-Tag: v1.6.1-rc1~314
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a19a424010970a076a51afb4b378c9edcd908ff9?hp=a19a424010970a076a51afb4b378c9edcd908ff9

Revert "Convert output messages in merge-recursive to past tense."

During a conflicting merge, you would typically see:

Auto-merged foo.txt
CONFLICT (content): Merge conflict in foo.txt
Recorded preimage for 'foo.txt'
Automatic merge failed; fix conflicts and then commit the result.

and left wondering what happened to "foo.txt".  Did it succeed, and then
conflicted, and then what?

This is because historically there was a progress bar displayed before the
auto-merge is mentioned, and it was expected to take long time, before we
can say "Auto-merged foo.txt".  It turns out it was not the case, and the
original wording "Auto-merging foo.txt" we used to have before 89f40be
(Convert output messages in merge-recursive to past tense., 2007-01-14) is
better.

Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---