log mercurial/filemerge.py @ 46819:d4ba4d51f85f

age author description
Thu, 25 Mar 2021 18:02:08 +0100 Rapha?l Gom?s contributor: change mentions of mpm to olivia
Thu, 04 Feb 2021 13:05:51 -0800 Martin von Zweigbergk diff: replace --merge option by config option