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)
commitc12401705c41a216e3ef777f6faaf192b974aabe
tree84f416c513ec96dbdfa5a968bc353b0bcd2ccb8e
parentb6d323f1646d7204fc6693071e5be84377ece70b
parent69f9c87d4654aad8011444727194c3053827ae07
Merge branch 'zb/userdiff-fountain'

New userdiff pattern definition for fountain screenwriting markup
format.

* zb/userdiff-fountain:
  userdiff: add support for Fountain documents