commit 456a68ee1407a77f3e804a30dff245bb6c6b872f ce8e0b86a1e9877f42fe9453ede418519115f367 51a3b654f252210572297f47597b31527c475fb8 (HEAD -> refs/heads/master)
Merge: ce8e0b8 51a3b65
Author:     Zhongpeng Lin (林中鹏) <lin.zhp@example.com>
AuthorDate: Tue Feb 11 22:10:39 2014 -0800
Commit:     Zhongpeng Lin (林中鹏) <lin.zhp@example.com>
CommitDate: Tue Feb 11 22:10:39 2014 -0800

    Merge branch 'lzp'
    
    Conflicts:
    	aaa/otherthing

1	0	aaa/otherthing.renamed
::100644 100644 100644 e69de29... 58a6c75... 58a6c75... MR	aaa/otherthing.renamed

commit 51a3b654f252210572297f47597b31527c475fb8 589bb080f059834829a2a5955bebfd7c2baa110a (refs/heads/lzp)
Author:     Zhongpeng Lin (林中鹏) <lin.zhp@example.com>
AuthorDate: Tue Feb 11 22:09:26 2014 -0800
Commit:     Zhongpeng Lin (林中鹏) <lin.zhp@example.com>
CommitDate: Tue Feb 11 22:09:26 2014 -0800

    modify aaa/otherthing

:100644 100644 e69de29... 58a6c75... M	aaa/otherthing
1	0	aaa/otherthing

commit ce8e0b86a1e9877f42fe9453ede418519115f367 589bb080f059834829a2a5955bebfd7c2baa110a
Author:     Zhongpeng Lin (林中鹏) <lin.zhp@example.com>
AuthorDate: Tue Feb 11 22:07:49 2014 -0800
Commit:     Zhongpeng Lin (林中鹏) <lin.zhp@example.com>
CommitDate: Tue Feb 11 22:07:49 2014 -0800

    rename aaa/otherthing

:100644 100644 e69de29... e69de29... R100	aaa/otherthing	aaa/otherthing.renamed
0	0	aaa/{otherthing => otherthing.renamed}

commit 589bb080f059834829a2a5955bebfd7c2baa110a c6ba8f7a1058db3e6b4bc6f1090e932b107605fb (refs/remotes/origin/master, refs/remotes/origin/HEAD)
Author:     Eduardo Morais <companheiro.vermelho@example.com>
AuthorDate: Tue Aug 14 15:04:01 2012 -0300
Commit:     Eduardo Morais <companheiro.vermelho@example.com>
CommitDate: Tue Aug 14 15:04:01 2012 -0300

    Create "deeply" nested file

:000000 100644 0000000... 7a25991... A	eee/fff/wildthing
1	0	eee/fff/wildthing

commit c6ba8f7a1058db3e6b4bc6f1090e932b107605fb c0d66f92a95e31c77be08dc9d0f11a16715d1885
Author:     Eduardo Morais <companheiro.vermelho@example.com>
AuthorDate: Tue Aug 14 14:45:51 2012 -0300
Commit:     Eduardo Morais <companheiro.vermelho@example.com>
CommitDate: Tue Aug 14 14:45:51 2012 -0300

    Add one final file

:000000 100644 0000000... e69de29... A	ddd/finalthing
0	0	ddd/finalthing

commit c0d66f92a95e31c77be08dc9d0f11a16715d1885 7debcf8a2f57f86663809c58b5c07a398be7674c
Author:     Eduardo Morais <companheiro.vermelho@example.com>
AuthorDate: Tue Aug 14 14:35:02 2012 -0300
Commit:     Eduardo Morais <companheiro.vermelho@example.com>
CommitDate: Tue Aug 14 14:35:02 2012 -0300

    Deleted and renamed file

:100644 000000 e69de29... 0000000... D	bbb/bthing
:100644 100644 e69de29... e69de29... R100	bbb/something	bbb/something.renamed
0	0	bbb/bthing
0	0	bbb/{something => something.renamed}

commit 7debcf8a2f57f86663809c58b5c07a398be7674c 87783129c3f00d2c81a3a8e585eb86a47e39891a
Author:     Eduardo Morais <companheiro.vermelho@example.com>
AuthorDate: Tue Aug 14 14:33:27 2012 -0300
Commit:     Eduardo Morais <companheiro.vermelho@example.com>
CommitDate: Tue Aug 14 14:33:27 2012 -0300

    Added new file

:000000 100644 0000000... e69de29... A	bbb/ccc/yet_anotherthing
0	0	bbb/ccc/yet_anotherthing

commit 87783129c3f00d2c81a3a8e585eb86a47e39891a bc57a9209f096a130dcc5ba7089a8663f758a703
Author:     Eduardo Morais <companheiro.vermelho@example.com>
AuthorDate: Tue Aug 14 14:32:15 2012 -0300
Commit:     Eduardo Morais <companheiro.vermelho@example.com>
CommitDate: Tue Aug 14 14:32:15 2012 -0300

    Renamed file

:100644 100644 e69de29... e69de29... R100	aaa/something	bbb/something
0	0	{aaa => bbb}/something

commit bc57a9209f096a130dcc5ba7089a8663f758a703
Author:     Eduardo Morais <companheiro.vermelho@example.com>
AuthorDate: Tue Aug 14 14:30:13 2012 -0300
Commit:     Eduardo Morais <companheiro.vermelho@example.com>
CommitDate: Tue Aug 14 14:30:13 2012 -0300

    Initial commit on test repository

:000000 100644 0000000... e69de29... A	aaa/otherthing
:000000 100644 0000000... e69de29... A	aaa/something
:000000 100644 0000000... e69de29... A	bbb/bthing
0	0	aaa/otherthing
0	0	aaa/something
0	0	bbb/bthing

commit 49345fe87bd1dfad7e682f6554f7472c5576a8c7
Author:     Eduardo Morais <companheiro.vermelho@example.com>
AuthorDate: Tue Jan 9 15:30:49 2018 +0100
Commit:     Eduardo Morais <companheiro.vermelho@example.com>
CommitDate: Tue Jan 9 15:30:49 2018 +0100

    Moving things around

:100644 100644 802992c... 802992c... R100	src1/file3.txt	src3/file3.txt
:100644 100644 802992c... 802992c... R100	src2/file2.txt	src3/file4.txt
0	0	{src1 => src3}/file3.txt
0	0	src2/file2.txt => src3/file4.txt
