filediff: Mark conflict as resolved from file comparison (bgo#698645)
WIP: Port to C++