From a40d384caca008c0334a35e9ac298f2eeb5decd2 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 13 Jul 2006 19:51:12 -0700 Subject: t4013 diff format tests update This changes one test commit in the sequence to have more than one lines of commit log. A few output formats (--pretty=email aka format-patch and --pretty=oneline) need to behave differently on single and multi-line log, and this change will help catching breakages. Signed-off-by: Junio C Hamano --- t/t4013/diff.show_master | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 't/t4013/diff.show_master') diff --git a/t/t4013/diff.show_master b/t/t4013/diff.show_master index 3772a87e13..9e6e1f2710 100644 --- a/t/t4013/diff.show_master +++ b/t/t4013/diff.show_master @@ -1,6 +1,6 @@ $ git show master -commit 176b998f5d647cbd77a9d8acf4531e930754d16d -Merge: 889b315... c7a2ab9... +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 +Merge: 9a6d494... c7a2ab9... Author: A U Thor Date: Mon Jun 26 00:04:00 2006 +0000 -- cgit v1.2.3