Merge commit 'f4cdd20cb106c9e0ba57bc63b4231f9da6e72513' into felipec

2025-10-26 14:16:07 +01:00 · 2025-08-23 15:27:12 +02:00
parent 16b33919e4 f4cdd20cb1
commit ce7ddae09a
32 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@@ -29,7 +29,7 @@ build:
 doc: doc/git-remote-hg.1
 test:
-	$(MAKE) -C test
+	$(MAKE) -C t
 doc/git-remote-hg.1: doc/git-remote-hg.txt
 	asciidoctor -d manpage -b manpage $<
--- a/test/.gitignore
+++ b/test/.gitignore
--- a/test/Makefile
+++ b/test/Makefile
--- a/test/bidi.t
+++ b/test/bidi.t
--- a/test/expected/converged
+++ b/test/expected/converged
--- a/test/expected/converged
+++ b/test/expected/converged
--- a/test/expected/encoding/git-log
+++ b/test/expected/encoding/git-log
--- a/test/expected/encoding/hg-log
+++ b/test/expected/encoding/hg-log
--- a/test/expected/executable
+++ b/test/expected/executable
--- a/test/expected/executable
+++ b/test/expected/executable
--- a/test/expected/file
+++ b/test/expected/file
--- a/test/expected/file
+++ b/test/expected/file
--- a/test/expected/git
+++ b/test/expected/git
--- a/test/expected/hg
+++ b/test/expected/hg
--- a/test/expected/hg
+++ b/test/expected/hg
--- a/test/expected/hg
+++ b/test/expected/hg
--- a/test/expected/hg
+++ b/test/expected/hg
--- a/test/expected/hg
+++ b/test/expected/hg
--- a/test/expected/merge
+++ b/test/expected/merge
--- a/test/expected/merge
+++ b/test/expected/merge
--- a/test/expected/merge
+++ b/test/expected/merge
--- a/test/expected/merge
+++ b/test/expected/merge
--- a/test/expected/rename/git-log
+++ b/test/expected/rename/git-log
--- a/test/expected/rename/hg-log
+++ b/test/expected/rename/hg-log
--- a/test/expected/symlink/log
+++ b/test/expected/symlink/log
--- a/test/expected/symlink/output
+++ b/test/expected/symlink/output
--- a/test/helper.t
+++ b/test/helper.t
--- a/test/hg-git.t
+++ b/test/hg-git.t
--- a/test/main-push.t
+++ b/test/main-push.t
--- a/test/main.t
+++ b/test/main.t
--- a/test/sharness.sh
+++ b/test/sharness.sh
--- a/test/test-lib.sh
+++ b/test/test-lib.sh