@ -2,33 +2,33 @@ feature done
reset refs/heads/master
commit refs/heads/master
mark :1
author Full Name <user@organization.tld> 100002 0000 +0100
committer Full Name <user@organization.tld> 100002 0000 +0100
author Full Name <user@organization.tld> 100000 0000 +0100
committer Full Name <user@organization.tld> 100000 0000 +0100
data 2
C
A
commit refs/heads/master
mark :2
author Full Name <user@organization.tld> 100003 0000 +0100
committer Full Name <user@organization.tld> 100003 0000 +0100
author Full Name <user@organization.tld> 100001 0000 +0100
committer Full Name <user@organization.tld> 100001 0000 +0100
data 2
D
B
from :1
reset refs/heads/master
commit refs/heads/master
mark :3
author Full Name <user@organization.tld> 100000 0000 +0100
committer Full Name <user@organization.tld> 100000 0000 +0100
author Full Name <user@organization.tld> 100002 0000 +0100
committer Full Name <user@organization.tld> 100002 0000 +0100
data 2
A
C
commit refs/heads/master
mark :4
author Full Name <user@organization.tld> 100001 0000 +0100
committer Full Name <user@organization.tld> 100001 0000 +0100
author Full Name <user@organization.tld> 100003 0000 +0100
committer Full Name <user@organization.tld> 100003 0000 +0100
data 2
B
D
from :3
blob
@ -42,8 +42,8 @@ author Full Name <user@organization.tld> 1000040000 +0100
committer Full Name <user@organization.tld> 1000040000 +0100
data 29
E: Merge commit 'D' into 'B'
from :4
merge :2
from :2
merge :4
M 100644 :5 keepme
commit refs/heads/master
@ -68,8 +68,8 @@ author Full Name <user@organization.tld> 1000050000 +0100
committer Full Name <user@organization.tld> 1000050000 +0100
data 29
F: Merge commit 'D' into 'B'
from :4
merge :2
from :2
merge :4
blob
mark :10