• Show log

    Commit

  • Hash : 1acd48bc
    Author : Stefan Sperling
    Date : 2021-09-24T20:47:39

    stop caring about obstructed versioned files in 'got merge'
    
    Tyring to write a test to cover this case I found that obstructed files
    are (correctly) detected as local modifications in the work tree. Thus
    they trigger the pre-condition check for local modications and 'got merge'
    will not even start to do any work in the presence of obstructed files.