Merge branch 'jk/add-p-skip-conflicts' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 Apr 2012 17:35:07 +0000 (10:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 Apr 2012 17:35:07 +0000 (10:35 -0700)
commit4579a05...7cc558bd0e341adb77897e1f2f331f78
tree4ce9843...5e8935077422adcff522a2ac31c7ea03copy hash to clipboard (tree)
parent695db86...d73cc3c1dca43fb60cdf469f8d26e358copy hash to clipboard (diff)
parent4066bd6...97a36ece00ffcb4814edc11e5ed25f68copy hash to clipboard (diff)