--- a/mercurial/defaultrc/mergetools.rc	Thu Sep 22 16:09:53 2022 +0200
+++ b/mercurial/defaultrc/mergetools.rc	Mon Oct 03 14:24:12 2022 +0200
@@ -107,7 +107,7 @@
 
 meld.args=--label=$labellocal $local --label='merged' $base --label=$labelother $other -o $output --auto-merge
 meld.check=changed
-meld.diffargs=-a --label=$plabel1 $parent --label=$clabel $child
+meld.diffargs=--label=$plabel1 $parent --label=$clabel $child
 meld.gui=True
 
 merge.check=conflicts