- from each of the parents to the merge result\r
- simultaneously, instead of showing pairwise diff between\r
- a parent and the result one at a time, which <em>-m</em> option\r
- output does. <em>--cc</em> further compresses the output by\r
- omiting hunks that show differences from only one\r
+ from each of the parents to the merge result simultaneously\r
+ instead of showing pairwise diff between a parent and the\r
+ result one at a time (which is what the <em>-m</em> option does).\r
+ Furthermore, it lists only files which were modified\r
+ from all parents.\r
+</p>\r
+</dd>\r
+<dt>\r
+--cc\r
+</dt>\r
+<dd>\r
+<p>\r
+ This flag changes the way a merge commit patch is displayed,\r
+ in a similar way to the <em>-c</em> option. It implies the <em>-c</em>\r
+ and <em>-p</em> options and further compresses the patch output\r
+ by omitting hunks that show differences from only one\r