tree b57203506f3847962f961ac90f74607d9d919f02
parent 71f4b1834a8b4d1cb24ea326ca4a3fcc02796a5a
author Jakub Narebski <jnareb@gmail.com> 1178318915 +0200
committer Junio C Hamano <junkio@cox.net> 1178323097 -0700

diff format documentation: describe raw combined diff format

Add description of raw combined diff format to diff-formats.txt,
as "diff format for merges" section, before "Generating patches..."
section.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>