Merge branch 'rs/merge-tree-simplify'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:36 +0000 (11:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:36 +0000 (11:38 -0700)
commit7669461...59aaee1587bac77c4a446e9365b582c7
tree9a0df04...16127d09ee2a6d4fc813380d1a4e40bbcopy hash to clipboard (tree)
parent83510ef...fda0df6acd6680410698a1762042a8afcopy hash to clipboard (diff)
parent5706528...a9ef2fc962ec7f82f9771b45eba8dba1copy hash to clipboard (diff)