index 029c5f2b82c5bece3fa4a9e6e87b83c517e0c7f6..517e1eba3c56907ebcb1d478dceb184e53fceda4 100644 (file)
+
or like this (when '--cc' option is used):
- diff --c file
+ diff --cc file
2. It is followed by one or more extended header lines
(this example shows a merge with two parents):