# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1602224341 25200
# Node ID 66cb7ad3787ca10558ef747036e5417c4f352707
# Parent  7990e7d957b01b3639f11b1d597cbe400e78d5b3# Parent  4a146cff76fab1d239e527f6e24ebedc5ba4ce77
branching: merge with stable

diff -r 7990e7d957b0 -r 66cb7ad3787c tests/test-convert-git.t
--- a/tests/test-convert-git.t	Thu Oct 01 09:45:00 2020 +0200
+++ b/tests/test-convert-git.t	Thu Oct 08 23:19:01 2020 -0700
@@ -1,5 +1,7 @@
 #require git
 
+  $ echo "[init]" >> $HOME/.gitconfig
+  $ echo "defaultBranch = master" >> $HOME/.gitconfig
   $ echo "[core]" >> $HOME/.gitconfig
   $ echo "autocrlf = false" >> $HOME/.gitconfig
   $ echo "[core]" >> $HOME/.gitconfig
diff -r 7990e7d957b0 -r 66cb7ad3787c tests/test-doctest.py
--- a/tests/test-doctest.py	Thu Oct 01 09:45:00 2020 +0200
+++ b/tests/test-doctest.py	Thu Oct 08 23:19:01 2020 -0700
@@ -72,6 +72,9 @@
 
 cwd = os.path.dirname(os.environ["TESTDIR"])
 
+if not os.path.isdir(os.path.join(cwd, ".hg")):
+    sys.exit(0)
+
 files = subprocess.check_output(
     "hg files --print0 \"%s\"" % fileset, shell=True, cwd=cwd,
 ).split(b'\0')