svn commit: r1618907 - /subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.cpp

[brane]

Author: brane
Date: Tue Aug 19 17:26:53 2014
New Revision: 1618907

URL: http://svn.apache.org/r1618907
Log:
Remove the (currently) final deprecation warning from JavaHL.

* 
subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.cpp
  (Java_org_apache_subversion_javahl_util_DiffLib_nativeFileMerge):
   Use svn_diff_file_output_merge3.

Modified:
    
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.cpp

Modified: 
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.cpp
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.cpp?rev=1618907&r1=1618906&r2=1618907&view=diff
==============================================================================
--- 
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.cpp
 (original)
+++ 
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.cpp
 Tue Aug 19 17:26:53 2014
@@ -190,7 +190,7 @@ Java_org_apache_subversion_javahl_util_D
 
   OutputStream result_stream(jresult_stream);
 
-  SVN_JNI_ERR(svn_diff_file_output_merge2(
+  SVN_JNI_ERR(svn_diff_file_output_merge3(
                   result_stream.getStream(pool), diff,
                   original.c_str(), modified.c_str(), latest.c_str(),
                   conflict_original.c_str(),
@@ -198,6 +198,7 @@ Java_org_apache_subversion_javahl_util_D
                   conflict_latest.c_str(),
                   conflict_separator.c_str(),
                   svn_diff_conflict_display_style_t(jconflict_style_ordinal),
+                  NULL, NULL,
                   pool.getPool()),
               false);