diff options
| author |  Jonathan del Strother <maillist@steelskies.com> | 2008-08-22 18:18:44 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-08-22 16:51:21 -0700 |
| commit | a19a424010970a076a51afb4b378c9edcd908ff9 (patch) | |
| tree | 49bffb9fa1b37b0818462478e28bcb163e055ca4 /builtin-commit.c | |
| parent | templates/Makefile: install is unnecessary, just use mkdir -p (diff) | |
| download | tgif-a19a424010970a076a51afb4b378c9edcd908ff9.tar.xz | |
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>
Diffstat (limited to 'builtin-commit.c')
0 files changed, 0 insertions, 0 deletions