[[[
Index: subversion/libsvn_client/merge.c
===================================================================
--- subversion/libsvn_client/merge.c (revision 1174351)
+++ subversion/libsvn_client/merge.c (working copy)
@@ -6822,7 +6822,7 @@ do_file_merge(svn_mergeinfo_catalog_t result_catal
&inherited, svn_mergeinfo_inherited,
merge_b->ra_session1, target_abspath,
MAX(revision1, revision2),
- 0, /* Get all implicit mergeinfo */
+ MIN(revision1, revision2),
ctx, scratch_pool, iterpool);
if (err)
]]]
This reverts a hunk of r1035894 (the revision merging the
issue-3668-3669 branch to trunk).