Merge branch 'jk/add-p-skip-conflicts'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Apr 2012 19:43:36 +0000 (12:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Apr 2012 19:43:36 +0000 (12:43 -0700)
commit3c52400...d67471f8ef5455ef0e5ce3e6fc846b32
treea836591...51828d4feec3124794509bb43a2cb3f0copy hash to clipboard (tree)
parent091df17...27ed735160bbd82360efb8154b35ffebcopy hash to clipboard (diff)
parent4066bd6...97a36ece00ffcb4814edc11e5ed25f68copy hash to clipboard (diff)