comparison doc/style.css @ 44472:b8882f5d7cb4

copies-tests: update the analysis of the BD/DB cases After thinking more about it, the current change in output between the two merges is not due to an ambiguity, it is introduce by a bug in merge/commit that record a wrong file history. Fixing the bug should fix the output. In the meantime, we have a wrong behavior. In practice the bug is not in the merge code (who does the right things), but in the commit code (who get confused when recording the new file revision). Differential Revision: https://phab.mercurial-scm.org/D8237
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 03 Mar 2020 09:27:31 +0100
parents 4b0fc75f9403
children
comparison
equal deleted inserted replaced
44471:68e14fecd82a 44472:b8882f5d7cb4