Skip to content
Snippets Groups Projects
Commit a67f5baf authored by Tay Ray Chuan's avatar Tay Ray Chuan
Browse files

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: default avatarTay Ray Chuan <rctay89@gmail.com>
parent 4bb2a81c
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment