tests: accomodate changes in git-merge output
Since git v1.7.7, merge outputs its status in the form
Merge made by the * strategy.
Use a regex substitution, so that older versions are handled
successfully as well.
Signed-off-by:
Tay Ray Chuan <rctay89@gmail.com>
Loading
Please register or sign in to comment