[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Fri, 19 Apr 2013 20:33:08 +0100 (BST)

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.
> ]]]
>
Received on 2013-04-19 21:34:03 CEST

This is an archived mail posted to the Subversion Dev mailing list.