-
Orgad Shaneh authored
If you have several files that require merging, and you externally resolve (and git add) some of them, the following message appears: foo.cpp: file does not need merging Continue merging other unresolved paths [y/n]? We don't identify the first line, so the second one is lost too. Change-Id: I54c579910656c07be7e6b3236551257443fe8fb9 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
71c2352e