Merge branch 'jk/merge-tree-added-identically'
authorJunio C Hamano <gitster@pobox.com>
Thu, 18 Apr 2013 18:49:31 +0000 (11:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Apr 2013 18:49:31 +0000 (11:49 -0700)
commite7e656c...9ab6bb0eda6312045cb5d61448309bcb
treef94e0a4...00c47bc60040b9f354f43a83f91848dfcopy hash to clipboard (tree)
parent77354d8...dc6e0bf407de23d762760cccee5d757ccopy hash to clipboard (diff)
parentaacecc3...36a6cd4d2707e3f1cbd7bb4122477c64copy hash to clipboard (diff)