aboutsummaryrefslogtreecommitdiffstats
path: root/subversion/svn
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2014-05-27 04:55:31 +0000
committerPeter Wemm <peter@FreeBSD.org>2014-05-27 04:55:31 +0000
commit41a48a0a1803245a188068c5200383b9543c25b2 (patch)
tree6d1265a766b5c11e4c2414a994dbabb861526c73 /subversion/svn
parent219f5ebf8fca3572d8d4265d78d0e4670ca35a27 (diff)
downloadsrc-41a48a0a1803245a188068c5200383b9543c25b2.tar.gz
src-41a48a0a1803245a188068c5200383b9543c25b2.zip
Vendor import svn-1.8.9vendor/subversion/subversion-1.8.9
Notes
Notes: svn path=/vendor/subversion/dist/; revision=266729 svn path=/vendor/subversion/subversion-1.8.9/; revision=266730; tag=vendor/subversion/subversion-1.8.9
Diffstat (limited to 'subversion/svn')
-rw-r--r--subversion/svn/conflict-callbacks.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/subversion/svn/conflict-callbacks.c b/subversion/svn/conflict-callbacks.c
index 3d41ecf93670..b5cdf5f0785e 100644
--- a/subversion/svn/conflict-callbacks.c
+++ b/subversion/svn/conflict-callbacks.c
@@ -935,7 +935,7 @@ handle_text_conflict(svn_wc_conflict_result_t *result,
/* We only allow the user accept the merged version of
the file if they've edited it, or at least looked at
the diff. */
- if (result->choice == svn_wc_conflict_choose_merged
+ if (opt->choice == svn_wc_conflict_choose_merged
&& ! knows_something)
{
SVN_ERR(svn_cmdline_fprintf(