3 Commits

Author	SHA1	Message	Date
Phil Cohen	3e592b81ae	filemerge: add number of textual conflicts in each file to error message ... Summary: When you get an error, let's print the number of conflicts in each file. This will give the user some sense of how much work they have to do. The code change is entirely in `filemerge.py`, and `tests/test-merge-conflict-count.t` adds a new test. Reviewed By: quark-zju Differential Revision: D9815243 fbshipit-source-id: 1b73a1db293902ac7242997a7d6ae09478344068	2018-10-22 12:47:41 -07:00
Jun Wu	b7eb2e64e3	mdiff: use xdiff for diff calculation ... Summary: Let's switch to xdiff for its better diff quality and performance! The test changes demonstrate xdiff's better diff quality. Reviewed By: ryanmce Differential Revision: D7135206 fbshipit-source-id: 1775df6fc0f763df074b4f52779835d6ef0f3a4e	2018-04-13 21:51:21 -07:00
Jun Wu	1ce8dceb3a	tests: add tests for upcoming xdiff change ... Summary: The next test is going to switch bdiff to xdiff. This diff adds related tests so we can clearly how xdiff improves the diff quality. It also solves [issue5091](https://bz.mercurial-scm.org/5091) because xdiff will shift hunks up and down to group them together. So that was also added as a test. Although in a more complex case where the hunks are separated by some common lines (ex. "Y"), xdiff won't help either. Reviewed By: ryanmce Differential Revision: D7147444 fbshipit-source-id: 3605290b5dfdfc7b8b004b38c7f7ee9534915380	2018-04-13 21:51:21 -07:00