git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
blob 2090d12a489e5d06980c306ec2a42c562edb66c6 277 bytes (raw)
name: t/t7609-mergetool--lib.sh 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
 
#!/bin/sh

test_description='git mergetool

Testing basic merge tools options'

TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh

test_expect_success 'mergetool --tool=vimdiff creates the expected layout' '
	. "$GIT_SOURCE_DIR"/mergetools/vimdiff &&
	run_unit_tests
'

test_done

debug log:

solving 2090d12a489 ...
found 2090d12a489 in https://public-inbox.org/git/patch-3.9-addaf73992f-20221021T091013Z-avarab@gmail.com/ ||
	https://public-inbox.org/git/patch-v4-06.14-6c254f8cb9f-20221103T160255Z-avarab@gmail.com/ ||
	https://public-inbox.org/git/patch-v3-05.12-5c7b64286ce-20221101T225022Z-avarab@gmail.com/ ||
	https://public-inbox.org/git/patch-v2-05.11-6387682db06-20221027T032622Z-avarab@gmail.com/ ||
	https://public-inbox.org/git/patch-v6-06.15-1f326944a07-20221206T001617Z-avarab@gmail.com/ ||
	https://public-inbox.org/git/patch-v5-06.15-7ee341245a8-20221202T110947Z-avarab@gmail.com/
found 8b1c3bd39f2 in https://80x24.org/mirrors/git.git
preparing index
index prepared:
100755 8b1c3bd39f2249417099ea2f24218268925909af	t/t7609-mergetool--lib.sh

applying [1/1] https://public-inbox.org/git/patch-3.9-addaf73992f-20221021T091013Z-avarab@gmail.com/
diff --git a/t/t7609-mergetool--lib.sh b/t/t7609-mergetool--lib.sh
index 8b1c3bd39f2..2090d12a489 100755

Checking patch t/t7609-mergetool--lib.sh...
Applied patch t/t7609-mergetool--lib.sh cleanly.

skipping https://public-inbox.org/git/patch-v4-06.14-6c254f8cb9f-20221103T160255Z-avarab@gmail.com/ for 2090d12a489
skipping https://public-inbox.org/git/patch-v3-05.12-5c7b64286ce-20221101T225022Z-avarab@gmail.com/ for 2090d12a489
skipping https://public-inbox.org/git/patch-v2-05.11-6387682db06-20221027T032622Z-avarab@gmail.com/ for 2090d12a489
skipping https://public-inbox.org/git/patch-v6-06.15-1f326944a07-20221206T001617Z-avarab@gmail.com/ for 2090d12a489
skipping https://public-inbox.org/git/patch-v5-06.15-7ee341245a8-20221202T110947Z-avarab@gmail.com/ for 2090d12a489
index at:
100755 2090d12a489e5d06980c306ec2a42c562edb66c6	t/t7609-mergetool--lib.sh

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).