diff options
Diffstat (limited to 'subversion/svn/conflict-callbacks.c')
| -rw-r--r-- | subversion/svn/conflict-callbacks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/subversion/svn/conflict-callbacks.c b/subversion/svn/conflict-callbacks.c index 356f59d95e05a..a9cb39a2ade16 100644 --- a/subversion/svn/conflict-callbacks.c +++ b/subversion/svn/conflict-callbacks.c @@ -775,7 +775,7 @@ handle_text_conflict(svn_wc_conflict_result_t *result, } else { - if (knows_something) + if (knows_something || desc->is_binary) *next_option++ = "r"; /* The 'mine-full' option selects the ".mine" file so only offer @@ -994,7 +994,7 @@ handle_text_conflict(svn_wc_conflict_result_t *result, the file if they've edited it, or at least looked at the diff. */ if (opt->choice == svn_wc_conflict_choose_merged - && ! knows_something) + && ! knows_something && diff_allowed) { SVN_ERR(svn_cmdline_fprintf( stderr, iterpool, |