| commit | 89f40be294363ce4d14ed6931a65561a4e8e9140 | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Sun, 14 Jan 2007 08:11:28 +0000 (14 03:11 -0500) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 14 Jan 2007 20:20:39 +0000 (14 12:20 -0800) | ||
| tree | fb1db53f76eac32424e095ee92e235e16996a727 | treesnapshot (tar.gz zip) |
| parent | 3f6ee2d15ab4be8690c17c0af0338b8495f6f706 | commitdiff |
Convert output messages in merge-recursive to past tense.
Now that we are showing the output messages for verbosity levels
<5 after all actions have been performed (due to the progress meter
running during the actions) it can be confusing to see messages in
the present tense when the user is looking at a '100% done' message
right above them. Converting the messages to past tense will appear
more correct in this case, and shouldn't affect a developer who is
debugging the application and running it at a verbosity level >=5.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Now that we are showing the output messages for verbosity levels
<5 after all actions have been performed (due to the progress meter
running during the actions) it can be confusing to see messages in
the present tense when the user is looking at a '100% done' message
right above them. Converting the messages to past tense will appear
more correct in this case, and shouldn't affect a developer who is
debugging the application and running it at a verbosity level >=5.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| merge-recursive.c | diffblobblamehistory |