← Back to branch summary

~ubuntu-branches/debian/sid/subversion/sid

« back to all changes in this revision

Viewing changes to subversion/svn/conflict-callbacks.c

  • Committer: Package Import Robot
  • Author(s): James McCoy
  • Date: 2014-05-20 22:45:32 UTC
  • mfrom: (0.2.12)
  • Revision ID: package-import@ubuntu.com-20140520224532-4fec3gohdzyy692g
Tags: 1.8.9-1
* New upstream release
* Merge changes from Ubuntu:
  - Add DEB-8 test for Apache functionality
  - debian/rules: Create pot file on build.
  - debian/rules: Ensure the doxygen output directory exists
  - Move svn2cl to subversion-tools' Suggests on Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/svn/conflict-callbacks.c
935
935
          /* We only allow the user accept the merged version of
936
936
             the file if they've edited it, or at least looked at
937
937
             the diff. */
938
 
          if (result->choice == svn_wc_conflict_choose_merged
 
938
          if (opt->choice == svn_wc_conflict_choose_merged
939
939
              && ! knows_something)
940
940
            {
941
941
              SVN_ERR(svn_cmdline_fprintf(