summaryrefslogtreecommitdiff
path: root/Documentation/git-checkout.txt
diff options
context:
space:
mode:
authorJonathan del Strother <maillist@steelskies.com>2008-08-22 17:18:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-08-22 23:51:21 (GMT)
commita19a424010970a076a51afb4b378c9edcd908ff9 (patch)
tree49bffb9fa1b37b0818462478e28bcb163e055ca4 /Documentation/git-checkout.txt
parent96cda0b1067b4b5a2f87785cc49e1e648d68ae1d (diff)
downloadgit-a19a424010970a076a51afb4b378c9edcd908ff9.zip
git-a19a424010970a076a51afb4b378c9edcd908ff9.tar.gz
git-a19a424010970a076a51afb4b378c9edcd908ff9.tar.bz2
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 'Documentation/git-checkout.txt')
0 files changed, 0 insertions, 0 deletions