Merge branch 'zb/userdiff-fountain'
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2015 18:01:29 +0000 (11:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2015 18:01:29 +0000 (11:01 -0700)
commitc124017...5c41a216e3ef777f6faaf192b974aabe
tree84f416c...13ec96dbdfa5a968bc353b0bcd2ccb8ecopy hash to clipboard (tree)
parentb6d323f...646d7204fc6693071e5be84377ece70bcopy hash to clipboard (diff)
parent69f9c87...4654aad8011444727194c3053827ae07copy hash to clipboard (diff)