Author: stsp
Date: Sat Aug 4 12:36:16 2012
New Revision: 1369306
URL: http://svn.apache.org/viewvc?rev=1369306&view=rev
Log:
* subversion/svn/file-merge.c
(merge_chunks): Slight wording tweak in file merge menu prompt.
Modified:
subversion/trunk/subversion/svn/file-merge.c
Modified: subversion/trunk/subversion/svn/file-merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/file-merge.c?rev=1369306&r1=1369305&r2=1369306&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/file-merge.c (original)
+++ subversion/trunk/subversion/svn/file-merge.c Sat Aug 4 12:36:16 2012
@@ -651,7 +651,7 @@ merge_chunks(apr_array_header_t **merged
" (e2) edit your version and use the result,\n"
" (eb) edit both versions and use the result,\n"
" (p) postpone this conflicting section leaving conflict
markers,\n"
- " (a) abort entire merge and return to main menu: "));
+ " (a) abort file merge and return to main menu: "));
/* Now let's see what the user wants to do with this conflict. */
while (TRUE)
