Merge branch 'bc/doc-merge-no-op-revert'
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Dec 2013 19:47:00 +0000 (11:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Dec 2013 19:47:01 +0000 (11:47 -0800)
commit0067272...99bcf3ac3929a77114ec0e095910e03d
tree2d8d4a7...5c8d58c2e8d49c98658883253419ac49copy hash to clipboard (tree)
parent4d1826d...d96a4284ef268c6febeaa9fabfa75e9ecopy hash to clipboard (diff)
parentc566500...327388832fa8be0b3bf17669f672481bcopy hash to clipboard (diff)