Merge branch 'mm/discourage-commit-a-to-finish-conflict-resolution'
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Sep 2014 17:33:29 +0000 (10:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Sep 2014 17:33:30 +0000 (10:33 -0700)
commit785514b...5544fbe2604ea657530134671f82e4b1
tree9d532ce...491690315135d93f0a830e98d61c50c9copy hash to clipboard (tree)
parent683b4d8...8c145594d5ef8dfbefb847dbe23c2c14copy hash to clipboard (diff)
parent91e70e0...ac3e72eb81e10273b48d884553e7d01dcopy hash to clipboard (diff)