Index: subversion/libsvn_client/merge.c
===================================================================
--- subversion/libsvn_client/merge.c	(revision 32499)
+++ subversion/libsvn_client/merge.c	(working copy)
@@ -1516,27 +1516,35 @@
                  svn_revnum_t rev,
                  void *baton)
 {
+  // TODO This function segfaulted for adm_access == NULL. I disabled all of
+  // the code that was added on the tree-conflicts branch for the case of
+  // adm_access == NULL. It remains to be seen if that's ok.
+
+  if (adm_access != NULL)
+    {
-  merge_cmd_baton_t *merge_b = baton;
-  apr_pool_t *subpool = svn_pool_create(merge_b->pool);
-  svn_node_kind_t kind;
-  const svn_wc_entry_t *entry;
+      merge_cmd_baton_t *merge_b = baton;
+      apr_pool_t *subpool = svn_pool_create(merge_b->pool);
+      svn_node_kind_t kind;
+      const svn_wc_entry_t *entry = NULL;
 
-  /* Find the version-control and on-disk states of this path */
-  SVN_ERR(svn_wc_entry(&entry, path, adm_access, TRUE, subpool));
-  SVN_ERR(svn_io_check_path(path, &kind, subpool));
+      /* Find the version-control and on-disk states of this path */
+      SVN_ERR(svn_wc_entry(&entry, path, adm_access, TRUE, subpool));
+      SVN_ERR(svn_io_check_path(path, &kind, subpool));
 
-  /* If we're trying to open a directory that's not a directory,
-   * raise a tree conflict. */
-  if (!entry || entry->schedule == svn_wc_schedule_delete
-      || kind != svn_node_dir)
-    {
-      SVN_ERR(tree_conflict(merge_b, adm_access, path,
-                            svn_node_dir,
-                            svn_wc_conflict_action_edit,
-                            svn_wc_conflict_reason_deleted));
-    }
+      /* If we're trying to open a directory that's not a directory,
+       * raise a tree conflict. */
+      if (!entry || entry->schedule == svn_wc_schedule_delete
+          || kind != svn_node_dir)
+        {
+          SVN_ERR(tree_conflict(merge_b, adm_access, path,
+                                svn_node_dir,
+                                svn_wc_conflict_action_edit,
+                                svn_wc_conflict_reason_deleted));
+        }

-  svn_pool_destroy(subpool);
+      svn_pool_destroy(subpool);
+    }
 
   return SVN_NO_ERROR;
 }