diff --git a/contrib/wix/guids.wxi b/contrib/wix/guids.wxi
--- a/contrib/wix/guids.wxi
+++ b/contrib/wix/guids.wxi
@@ -24,7 +24,7 @@
-
+
diff --git a/contrib/wix/templates.wxs b/contrib/wix/templates.wxs
--- a/contrib/wix/templates.wxs
+++ b/contrib/wix/templates.wxs
@@ -31,6 +31,7 @@
+
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2694,7 +2694,7 @@ def grep(ui, repo, pattern, *pats, **opt
Returns 0 if a match is found, 1 otherwise.
"""
- reflags = 0
+ reflags = re.M
if opts.get('ignore_case'):
reflags |= re.I
try:
diff --git a/tests/test-command-template.t b/tests/test-command-template.t
--- a/tests/test-command-template.t
+++ b/tests/test-command-template.t
@@ -1117,7 +1117,7 @@ Filters work:
$ hg log --template '{date|age}\n' > /dev/null || exit 1
$ hg log -l1 --template '{date|age}\n'
- 8 years from now
+ 7 years from now
$ hg log --template '{date|date}\n'
Wed Jan 01 10:01:00 2020 +0000
Mon Jan 12 13:46:40 1970 +0000
diff --git a/tests/test-grep.t b/tests/test-grep.t
--- a/tests/test-grep.t
+++ b/tests/test-grep.t
@@ -59,8 +59,9 @@ other
follow
- $ hg grep --traceback -f 'import$' port2
+ $ hg grep --traceback -f 'import\n\Z' port2
port:0:import
+
$ echo deport >> port2
$ hg commit -m 5 -u eggs -d '6 0'
$ hg grep -f --all -nu port port2