From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Aug 2015 18:01:29 +0000 (-0700)
Subject: Merge branch 'zb/userdiff-fountain'
X-Git-Tag: v2.6.0-rc0~87
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c12401705c41a216e3ef777f6faaf192b974aabe;p=git

Merge branch 'zb/userdiff-fountain'

New userdiff pattern definition for fountain screenwriting markup
format.

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

c12401705c41a216e3ef777f6faaf192b974aabe