Tree
- Tree:
1cee64078213fc6e41f187cc6d829968270d81fd
- Date:
- Message:
- 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.