[PATCH] Make h and ? work at the conflict prompt

[Mattias Engdegård]

The conflict help text says

  (s)  - show this list (also 'h', '?')
but h and ? don't actually work. Here is a patch.

[[[
Make "h" and "?" work at the conflict prompt as promised by the help  
text.

* subversion/svn/conflict-callbacks.c
  (prompt_user): Test for "h" and "?" before calling find_option,
   not after.
]]]
Index: subversion/svn/conflict-callbacks.c
===================================================================
--- subversion/svn/conflict-callbacks.c (revision 1469957)
+++ subversion/svn/conflict-callbacks.c (working copy)
@@ -575,20 +575,22 @@
   const char *answer;
 
   SVN_ERR(svn_cmdline_prompt_user2(&answer, prompt, prompt_baton, 
scratch_pool));
-  *opt = find_option(conflict_options, answer);
-
-  if (! *opt)
+  if (strcmp(answer, "h") == 0 || strcmp(answer, "?") == 0)
     {
-      SVN_ERR(svn_cmdline_fprintf(stderr, scratch_pool,
-                                  _("Unrecognized option.\n\n")));
-    }
-  else if (strcmp(answer, "h") == 0 || strcmp(answer, "?") == 0)
-    {
       SVN_ERR(svn_cmdline_fprintf(stderr, scratch_pool, "\n%s\n",
                                   help_string(conflict_options,
                                               scratch_pool)));
       *opt = NULL;
     }
+  else
+    {
+      *opt = find_option(conflict_options, answer);
+      if (! *opt)
+        {
+          SVN_ERR(svn_cmdline_fprintf(stderr, scratch_pool,
+                                      _("Unrecognized option.\n\n")));
+        }
+    }
   return SVN_NO_ERROR;
 }