The "combined diff format" documentation in diff-generate-patch.txt incorrectly implied that "log -p" shows conflict resolutions as combined diffs. With these small documentation fixes I'm hoping to save someone the time it took me to figure out how a merge conflict was resolved. Related thread: http://thread.gmane.org/gmane.comp.version-control.git/168481 The patches apply cleanly to maint. Hope this helps, -Adam ("meonkeys" on IRC) Adam Monsen (2): documentation fix: git log -p does not imply -c. English grammar fixes for combined diff doc. Documentation/diff-generate-patch.txt | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) -- 1.7.2.3 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html