Revert "Convert output messages in merge-recursive to past tense."
authorJonathan del Strother <maillist@steelskies.com>
Fri, 22 Aug 2008 17:18:44 +0000 (18:18 +0100)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 Aug 2008 23:51:21 +0000 (16:51 -0700)
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>
No differences found