The command used was:
svn merge -r22184:r22182 .
.....
r22184 | tlinnet | 2014-02-14 11:22:57 +0100 (Fri, 14 Feb 2014) | 6 lines
Modified the help text to explain that -p will launch relax in prompt mode after running any optionally supplied scripts.
Fix for sr #3117, (https://gna.org/support/?3117) - Functionality to inspect interactively after running script - The equivalence to python -i
This is to allow the -p --prompt option to be given without a script. relax should support this so that a user doesn't get too confused when
trying to start in prompt mode with the --prompt flag and support the --prompt argument without a script being supplied.
------------------------------------------------------------------------
r22183 | tlinnet | 2014-02-14 11:22:56 +0100 (Fri, 14 Feb 2014) | 1 line
Second
.....
