Submitter | Mads Kiilerich |
---|---|
Date | June 17, 2017, 9:06 p.m. |
Message ID | <863bb364f8201dda46c6.1497733582@xps> |
Download | mbox | patch |
Permalink | /patch/21469/ |
State | Changes Requested |
Headers | show |
Comments
Patch
diff --git a/hgext/mq.py b/hgext/mq.py --- a/hgext/mq.py +++ b/hgext/mq.py @@ -522,6 +522,7 @@ class queue(object): diffopts.noprefix = False diffopts.ignorews = False diffopts.ignorewsamount = False + diffopts.ignoreblanklines = False # note: diff options showfunc and unified might influence diffs # but don't do any harm return diffopts diff --git a/tests/test-mq-git.t b/tests/test-mq-git.t --- a/tests/test-mq-git.t +++ b/tests/test-mq-git.t @@ -258,6 +258,12 @@ Test how [diff] configuration influence literal 1 Ic${MZ000310RR91 + diff --git a/c b/c + --- a/c + +++ b/c + @@ -1,1 +1,2 @@ + a + + $ cd ..