master
err 2 lines 129 Bytes
Raw
1 alternate-conflict-dict.json: In alternate 'Alt':
2 alternate-conflict-dict.json:6: branch 'two' can't be distinguished from 'one'