aboutsummaryrefslogtreecommitdiffstats
path: root/subversion/svn/util.c
diff options
context:
space:
mode:
Diffstat (limited to 'subversion/svn/util.c')
-rw-r--r--subversion/svn/util.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/subversion/svn/util.c b/subversion/svn/util.c
index a18e5f37c9f7..757983a9963f 100644
--- a/subversion/svn/util.c
+++ b/subversion/svn/util.c
@@ -163,6 +163,8 @@ svn_cl__merge_file_externally(const char *base_path,
arguments[5] = wc_path;
arguments[6] = NULL;
+ /* Presumably apr_filepath_get() returns a valid path, so we don't have
+ to use the safe version of svn_dirent_internal_style() here. */
SVN_ERR(svn_io_run_cmd(svn_dirent_internal_style(cwd, pool), merge_tool,
arguments, &exitcode, NULL, TRUE, NULL, NULL, NULL,
pool));