diff options
Diffstat (limited to 't/t4013/diff.log_--patch-with-stat_master_--_dir_')
| -rw-r--r-- | t/t4013/diff.log_--patch-with-stat_master_--_dir_ | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/t/t4013/diff.log_--patch-with-stat_master_--_dir_ b/t/t4013/diff.log_--patch-with-stat_master_--_dir_ index 71a6d0f853..5187a26816 100644 --- a/t/t4013/diff.log_--patch-with-stat_master_--_dir_ +++ b/t/t4013/diff.log_--patch-with-stat_master_--_dir_ @@ -1,6 +1,6 @@ $ git log --patch-with-stat master -- dir/ -commit 176b998f5d647cbd77a9d8acf4531e930754d16d -Merge: 889b315... c7a2ab9... +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 +Merge: 9a6d494... c7a2ab9... Author: A U Thor <author@example.com> Date: Mon Jun 26 00:04:00 2006 +0000 @@ -25,7 +25,7 @@ index 35d242b..7289e35 100644 +1 +2 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Author: A U Thor <author@example.com> Date: Mon Jun 26 00:02:00 2006 +0000 @@ -45,11 +45,13 @@ index 8422d40..cead32e 100644 +E +F -commit 7952a93e09bf565b5592766a438b40cd81f4846f +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Author: A U Thor <author@example.com> Date: Mon Jun 26 00:01:00 2006 +0000 Second + + This is the second commit. --- dir/sub | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) |