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