aboutsummaryrefslogtreecommitdiffstats
path: root/tests/extensions/github_flavored.txt
diff options
context:
space:
mode:
authorWaylan Limberg <waylan@gmail.com>2012-01-18 21:29:19 -0500
committerWaylan Limberg <waylan@gmail.com>2012-01-18 21:29:19 -0500
commitc33dbafc2663e2d495c53ab0bf26f5f6c4087863 (patch)
treea00f8f59e2774438cf66125b362016a19ad1393e /tests/extensions/github_flavored.txt
parent77c587e1d16934608fc91aa34894836ef0d03a8b (diff)
parent69b365d07c7fabb206d9094398de2162cbcf6ba3 (diff)
downloadmarkdown-c33dbafc2663e2d495c53ab0bf26f5f6c4087863.tar.gz
markdown-c33dbafc2663e2d495c53ab0bf26f5f6c4087863.tar.bz2
markdown-c33dbafc2663e2d495c53ab0bf26f5f6c4087863.zip
Merge branch 'master' of git://github.com/fiesta/Python-Markdown into fiesta
Conflicts: markdown/inlinepatterns.py
Diffstat (limited to 'tests/extensions/github_flavored.txt')
-rw-r--r--tests/extensions/github_flavored.txt34
1 files changed, 34 insertions, 0 deletions
diff --git a/tests/extensions/github_flavored.txt b/tests/extensions/github_flavored.txt
new file mode 100644
index 0000000..d0737bd
--- /dev/null
+++ b/tests/extensions/github_flavored.txt
@@ -0,0 +1,34 @@
+index 0000000..6e956a9
+
+```diff
+--- /dev/null
++++ b/test/data/stripped_text/mike-30-lili
+@@ -0,0 +1,27 @@
++Summary:
++ drift_mod.py | 1 +
++ 1 files changed, 1 insertions(+), 0 deletions(-)
++
++commit da4bfb04debdd994683740878d09988b2641513d
++Author: Mike Dirolf <mike@dirolf.com>
++Date: Tue Jan 17 13:42:28 2012 -0500
++
++```
++minor: just wanted to push something.
++```
++
++diff --git a/drift_mod.py b/drift_mod.py
++index 34dfba6..8a88a69 100644
++
++```
++--- a/drift_mod.py
+++++ b/drift_mod.py
++@@ -281,6 +281,7 @@ CONTEXT_DIFF_LINE_PATTERN = re.compile(r'^('
++ '|\+ .*'
++ '|- .*'
++ ')$')
+++
++ def wrap_context_diffs(message_text):
++ return _wrap_diff(CONTEXT_DIFF_HEADER_PATTERN,
++ CONTEXT_DIFF_LINE_PATTERN,
++```
+```