You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2016/03/22 16:44:35 UTC
svn commit: r1736206 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Author: stsp
Date: Tue Mar 22 15:44:34 2016
New Revision: 1736206
URL: http://svn.apache.org/viewvc?rev=1736206&view=rev
Log:
* subversion/svn/conflict-callbacks.c
(handle_tree_conflict): Further formatting tweak for conflict prompt.
Modified:
subversion/trunk/subversion/svn/conflict-callbacks.c
Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1736206&r1=1736205&r2=1736206&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Tue Mar 22 15:44:34 2016
@@ -1441,12 +1441,11 @@ handle_tree_conflict(svn_boolean_t *reso
conflict, scratch_pool, scratch_pool));
SVN_ERR(svn_cmdline_fprintf(
stderr, scratch_pool,
- _("Tree conflict on '%s'\n"
- "- Local change:\n%s\n"
- "- Incoming change:\n%s\n"),
+ _("Tree conflict on '%s':\n"
+ "\n%s\n%s\n\n"),
svn_cl__local_style_skip_ancestor(path_prefix,
svn_client_conflict_get_local_abspath(conflict), scratch_pool),
- local_change_description, incoming_change_description));
+ incoming_change_description, local_change_description));
SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, NULL, conflict,
scratch_pool, scratch_pool));