0000000000000000000000000000000000000000000000000000000000000000 8a1ba45211ad8a31788f8dd5d622124df94bfeb4fd2322e4ee8540ddf2b02701 committer <committer@example.com> 946771200 +0000	commit (initial): original
8a1ba45211ad8a31788f8dd5d622124df94bfeb4fd2322e4ee8540ddf2b02701 8a1ba45211ad8a31788f8dd5d622124df94bfeb4fd2322e4ee8540ddf2b02701 committer <committer@example.com> 946771200 +0000	checkout: moving from main to A
8a1ba45211ad8a31788f8dd5d622124df94bfeb4fd2322e4ee8540ddf2b02701 bb0a3a5fa5c66790f01dda9c963b0564476ff411608305ef210c1e0b8b2b0c91 committer <committer@example.com> 946771200 +0000	commit: add 'new' with content A
bb0a3a5fa5c66790f01dda9c963b0564476ff411608305ef210c1e0b8b2b0c91 8a1ba45211ad8a31788f8dd5d622124df94bfeb4fd2322e4ee8540ddf2b02701 committer <committer@example.com> 946771200 +0000	checkout: moving from A to B
8a1ba45211ad8a31788f8dd5d622124df94bfeb4fd2322e4ee8540ddf2b02701 0db86975587ce0956e589a50709c947841ecbddf03e301984180fe39fe6b4d30 committer <committer@example.com> 946771200 +0000	commit: add new with content B and +x
0db86975587ce0956e589a50709c947841ecbddf03e301984180fe39fe6b4d30 8a1ba45211ad8a31788f8dd5d622124df94bfeb4fd2322e4ee8540ddf2b02701 committer <committer@example.com> 946771200 +0000	checkout: moving from B to expected
8a1ba45211ad8a31788f8dd5d622124df94bfeb4fd2322e4ee8540ddf2b02701 ed31be986f0109b036f037007778d31d9c519010c7476d2fae2c2403d38d5504 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
