diff format documentation: describe raw combined diff format
authorJakub Narebski <jnareb@gmail.com>
Fri, 4 May 2007 22:48:35 +0000 (00:48 +0200)
committerJunio C Hamano <junkio@cox.net>
Fri, 4 May 2007 23:58:17 +0000 (16:58 -0700)
commit3b559eab55693111e0922cd3dd41bfdba2e22989
treeb57203506f3847962f961ac90f74607d9d919f02
parent71f4b1834a8b4d1cb24ea326ca4a3fcc02796a5a
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>
Documentation/diff-format.txt