2 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
Saurabh Singh	6317ba0ca2	amend: replace with the fbamend extension ... Summary: The functionality we care about is provided by the `fbamend` extension. Therefore, lets replace the `amend` extension with the `fbamend` extension. Reviewed By: farnz Differential Revision: D10320739 fbshipit-source-id: 5700d39f488777fcc4033f60ce0a51cda15ef2ad	2018-10-11 06:59:23 -07:00