Commit 5248a1a5836707c33f2543f46f9e2254c03628cd
2017-11-11T15:53:18
tests: add test case for index reloads on merge Adds a test case for the issue #4203, when diverging indexes on memory and disk cause git merge to abort with GIT_ECONFLICT