filemerge: use working dir parent as ancestor for backward wdir merge I checked the tests, they were bogus in the first place

merge with stable

filectx: _fileid isn't normalized, use _filenode instead _fileid can be anything the lookup accepts (hex(node), node, rev, etc.), we should use something stable for comparisons (like _filenode).