index ca1bb6a8ee9ccb6ffa5a01c7e13af7c8caa83cdf..8a64869d2705071afe3d1a122b6b85a086413a0a 100644 (file)
cleanly resolved paths. The option -0 can be given to
omit diff output for unmerged entries and just show "Unmerged".
--c,--cc::
+-c::
+--cc::
This compares stage 2 (our branch), stage 3 (their
branch) and the working tree file and outputs a combined
diff, similar to the way 'diff-tree' shows a merge
GIT
---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite