X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4013%2Fdiff.log_-p_master;h=bf1326dc36629096fc4e4102375c8a9c550391aa;hb=c0250b6477d2edf58d0a7bc229bfa4f720c1cd58;hp=f8fefef2c3869337ba048d5cd6d95169dc60cf00;hpb=941fd1c041204f30279c175ca9b7252ffcb52ba2;p=git.git diff --git a/t/t4013/diff.log_-p_master b/t/t4013/diff.log_-p_master index f8fefef2c..bf1326dc3 100644 --- a/t/t4013/diff.log_-p_master +++ b/t/t4013/diff.log_-p_master @@ -1,6 +1,6 @@ $ git log -p master commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 -Merge: 9a6d494... c7a2ab9... +Merge: 9a6d494 c7a2ab9 Author: A U Thor Date: Mon Jun 26 00:04:00 2006 +0000