You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@subversion.apache.org by Mattias Engdegård <ma...@bredband.net> on 2013/04/19 20:43:03 UTC

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

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.
]]]

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

Posted by Julian Foad <ju...@btopenworld.com>.

Mattias Engdegård wrote:
> The conflict help text says
> 
>   (s)  - show this list (also 'h', '?')
> 
> but h and ? don't actually work. Here is a patch.

Thanks!  Committed in r1469994.  Proposed for backport to 1.8.x in r1470000.

- Julian


> [[[
> 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.
> ]]]
>