• Show log

    Commit

  • Hash : 5248a1a5
    Author : Etiene Dalcol
    Date : 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