Merge branch 'fc/mergetool-prompt'
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2014 19:06:44 +0000 (12:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2014 19:06:44 +0000 (12:06 -0700)
commit7ea60c1...cc98ab586aea77c256934acd438c7f95
treec581b23...af31427001ddc9e6d23243f167cf9947copy hash to clipboard (tree)
parente379831...b12502ae13a8e35e4a385665e810047fcopy hash to clipboard (diff)
parentc15bb0c...d73e4dad52a6d4869a254baf3a689b6acopy hash to clipboard (diff)