Index: subversion/svndumpfilter/main.c
===================================================================
--- subversion/svndumpfilter/main.c	(revision 28393)
+++ subversion/svndumpfilter/main.c	(working copy)
@@ -166,7 +166,7 @@
   svn_boolean_t drop_empty_revs;
   svn_boolean_t do_renumber_revs;
   svn_boolean_t preserve_revprops;
-  svn_boolean_t skip_missing_merge_sources;
+  svn_boolean_t skip_missing_merges;
   apr_array_header_t *prefixes;
 
   /* Input and output streams. */
@@ -670,12 +670,12 @@
       /* Determine whether the merge_source is a part of the prefix. */
       if (skip_path(merge_source, pb->prefixes, pb->do_exclude))
         {
-          if (pb->skip_missing_merge_sources)
+          if (pb->skip_missing_merges)
             continue;
           else
             return svn_error_createf(SVN_ERR_INCOMPLETE_DATA, 0,
                                      _("Missing merge source path '%s'; try "
-                                       "with --skip-missing-merge-sources"),
+                                       "with --skip-missing-merges"),
                                      merge_source);
         }
 
@@ -861,7 +861,7 @@
     svndumpfilter__drop_empty_revs = SVN_OPT_FIRST_LONGOPT_ID,
     svndumpfilter__renumber_revs,
     svndumpfilter__preserve_revprops,
-    svndumpfilter__skip_missing_merge_sources,
+    svndumpfilter__skip_missing_merges,
     svndumpfilter__quiet,
     svndumpfilter__version
   };
@@ -886,9 +886,9 @@
      N_("Remove revisions emptied by filtering.")},
     {"renumber-revs",      svndumpfilter__renumber_revs, 0,
      N_("Renumber revisions left after filtering.") },
-    {"skip-missing-merge-sources",
-     svndumpfilter__skip_missing_merge_sources, 0,
-     N_("Skip missing merge sources.") },
+    {"skip-missing-merges",
+     svndumpfilter__skip_missing_merges, 0,
+     N_("Skip missing merges.") },
     {"preserve-revprops",  svndumpfilter__preserve_revprops, 0,
      N_("Don't filter revision properties.") },
     {NULL}
@@ -904,14 +904,14 @@
      N_("Filter out nodes with given prefixes from dumpstream.\n"
         "usage: svndumpfilter exclude PATH_PREFIX...\n"),
      {svndumpfilter__drop_empty_revs, svndumpfilter__renumber_revs,
-      svndumpfilter__skip_missing_merge_sources,
+      svndumpfilter__skip_missing_merges,
       svndumpfilter__preserve_revprops, svndumpfilter__quiet} },
 
     {"include", subcommand_include, {0},
      N_("Filter out nodes without given prefixes from dumpstream.\n"
         "usage: svndumpfilter include PATH_PREFIX...\n"),
      {svndumpfilter__drop_empty_revs, svndumpfilter__renumber_revs,
-      svndumpfilter__skip_missing_merge_sources,
+      svndumpfilter__skip_missing_merges,
       svndumpfilter__preserve_revprops, svndumpfilter__quiet} },
 
     {"help", subcommand_help, {"?", "h"},
@@ -926,17 +926,16 @@
 /* Baton for passing option/argument state to a subcommand function. */
 struct svndumpfilter_opt_state
 {
-  svn_opt_revision_t start_revision;     /* -r X[:Y] is         */
-  svn_opt_revision_t end_revision;       /* not implemented.    */
-  svn_boolean_t quiet;                   /* --quiet             */
-  svn_boolean_t version;                 /* --version           */
-  svn_boolean_t drop_empty_revs;         /* --drop-empty-revs   */
-  svn_boolean_t help;                    /* --help or -?        */
-  svn_boolean_t renumber_revs;           /* --renumber-revs     */
-  svn_boolean_t preserve_revprops;       /* --preserve-revprops */
-  svn_boolean_t skip_missing_merge_sources;
-                                         /* --skip-missing-merge-sources */
-  apr_array_header_t *prefixes;          /* mainargs.           */
+  svn_opt_revision_t start_revision;     /* -r X[:Y] is           */
+  svn_opt_revision_t end_revision;       /* not implemented.      */
+  svn_boolean_t quiet;                   /* --quiet               */
+  svn_boolean_t version;                 /* --version             */
+  svn_boolean_t drop_empty_revs;         /* --drop-empty-revs     */
+  svn_boolean_t help;                    /* --help or -?          */
+  svn_boolean_t renumber_revs;           /* --renumber-revs       */
+  svn_boolean_t preserve_revprops;       /* --preserve-revprops   */
+  svn_boolean_t skip_missing_merges;     /* --skip-missing-merges */
+  apr_array_header_t *prefixes;          /* mainargs.             */
 };
 
 
@@ -962,7 +961,7 @@
   baton->preserve_revprops = opt_state->preserve_revprops;
   baton->quiet = opt_state->quiet;
   baton->prefixes = opt_state->prefixes;
-  baton->skip_missing_merge_sources = opt_state->skip_missing_merge_sources;
+  baton->skip_missing_merges = opt_state->skip_missing_merges;
   baton->rev_drop_count = 0; /* used to shift revnums while filtering */
   baton->dropped_nodes = apr_hash_make(pool);
   baton->renumber_history = apr_hash_make(pool);
@@ -1272,8 +1271,8 @@
         case svndumpfilter__preserve_revprops:
           opt_state.preserve_revprops = TRUE;
           break;
-        case svndumpfilter__skip_missing_merge_sources:
-          opt_state.skip_missing_merge_sources = TRUE;
+        case svndumpfilter__skip_missing_merges:
+          opt_state.skip_missing_merges = TRUE;
           break;
         default:
           {
Index: subversion/tests/cmdline/svndumpfilter_tests.py
===================================================================
--- subversion/tests/cmdline/svndumpfilter_tests.py	(revision 28393)
+++ subversion/tests/cmdline/svndumpfilter_tests.py	(working copy)
@@ -70,7 +70,7 @@
 
   filtered_out = filter_and_return_output(dumpfile, "include",
                                           "trunk", "branch1",
-                                          "--skip-missing-merge-sources",
+                                          "--skip-missing-merges",
                                           "--drop-empty-revs",
                                           "--renumber-revs", "--quiet")
   load_and_verify_dumpstream(sbox, [], [], None, filtered_out)
@@ -89,7 +89,7 @@
   test_create(sbox)
   filtered_out = filter_and_return_output(dumpfile, "exclude",
                                           "branch1",
-                                          "--skip-missing-merge-sources",
+                                          "--skip-missing-merges",
                                           "--drop-empty-revs",
                                           "--renumber-revs", "--quiet")
   load_and_verify_dumpstream(sbox, [], [], None, filtered_out)