RelNoteson commit merge-tree: remove unused df_conflict arguments (5706528)
   1Documentation/RelNotes/2.1.0.txt