seed

[git-p4: depot-paths = "//depot/git/gitp4test3/": change = 81]
edit

[git-p4: depot-paths = "//depot/git/gitp4test3/": change = 82]
Initial commit

[git-p4: depot-paths = "//depot/git/gitp4test3/": change = 83]
Kyle likes big butts and I don't know why

[git-p4: depot-paths = "//depot/git/gitp4test3/": change = 84]
kyle sux

[git-p4: depot-paths = "//depot/git/gitp4test3/": change = 85]
another

[git-p4: depot-paths = "//depot/git/gitp4test3/": change = 86]
Merge commit 'bb55e7e4bf32fb7febe2637fc03269761738f4b7'
will conflict
Merge branch 'p4master'