No matches were found for subject:"Bug#879558\: offers 3\-way merge even without \-\-three\-way option"