summaryrefslogtreecommitdiff
path: root/t/t4211/expect.parallel-change-f-to-main
AgeCommit message (Collapse)AuthorFilesLines
2020-02-07t4211: move SHA-1-specific test cases into a directoryLibravatar brian m. carlson1-160/+0
In preparation for adding SHA-256 support to this test, let's move the SHA-1-specific expected output into a directory called "sha1". This will allow us to add a similar directory for SHA-256 as well. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-04-12log -L: test merge of parallel modify/renameLibravatar Thomas Rast1-0/+160
This tests a toy example of a history like * Merge | \ | * Modify foo | | * | Rename foo->bar | / * Create foo Current log -L fails on this; we'll fix it in the next commit. Signed-off-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>