@borekb What do you think?

I'm trying to run tests for it, and doing a full suite was not the best idea :) It's been almost an hour an a half since it started.

Do you have a couple of examples of how the replacements actually look, before and after the fix?

Do you have a couple of examples of how the replacements actually look, before and after the fix?

test

Begin
post_modified = "2013-03-03 13:13:13"
End

test2

Begin
post_modified = "2014-03-03 13:13:13"
End

test3

Begin
post_modified = "2015-03-03 13:13:13"
End

test2 is the file that will change.

Testing done on by running ini-merge.sh on versionpress/wordpress:cli (which uses Alpine and therefore busybox tr, not gnu tr).

Before this change, test2:

Begin
post_modified = "2014-03-03 13:13:13"
End

Also, this error is output to stdout: sh: 2014-03-0313:13:13: bad number

With this change, test2:

Begin
post_modified = "2015-03-03 13:13:13"
End

and no error is output to stdout.

Awesome! When the tests finish (I'm now running only CloneMergeTest and it still takes ages!), I'm going to merge this.

Really glad you managed to fix this. We already have some friends working on the Go implementation but it might take a while so this is greatly appreciated 👍.

I tried only dateModifiedMergesAutomatically test and it works for me 🎉

For me too. Thanks, @candrews!

I am not sure if it is related, but running similar mergedDatesWithoutConflict test leads me to following Warning:

Warning: chmod(): Read-only file system in /opt/versionpress/src/Git/MergeDriverInstaller.php on line 97

Oh, now I see, that I removed @ yesterday during tests, so probably nothing important.