0000000000000000000000000000000000000000 a80891d88650998268c93a07b48dff45fc8fbcfd committer <committer@example.com> 946771200 +0000	commit (initial): original
a80891d88650998268c93a07b48dff45fc8fbcfd a80891d88650998268c93a07b48dff45fc8fbcfd committer <committer@example.com> 946771200 +0000	checkout: moving from main to A
a80891d88650998268c93a07b48dff45fc8fbcfd 9f77009f1d1f98c3e624f3909aaa02e589cf1eef committer <committer@example.com> 946771200 +0000	commit: add 'new' with content A
9f77009f1d1f98c3e624f3909aaa02e589cf1eef a80891d88650998268c93a07b48dff45fc8fbcfd committer <committer@example.com> 946771200 +0000	checkout: moving from A to B
a80891d88650998268c93a07b48dff45fc8fbcfd 607487b8a4b55faa02852cee5dee30f4cd1ea354 committer <committer@example.com> 946771200 +0000	commit: add new with content B and +x
607487b8a4b55faa02852cee5dee30f4cd1ea354 a80891d88650998268c93a07b48dff45fc8fbcfd committer <committer@example.com> 946771200 +0000	checkout: moving from B to expected
a80891d88650998268c93a07b48dff45fc8fbcfd 02d71cbeecffd41e050512003ad5df816e2b3591 committer <committer@example.com> 946771200 +0000	commit: Git has a better merge here, but that's due to better hunk handling/hunk splitting. We, however, consistently use +x
