]> git.ipfire.org Git - thirdparty/git.git/commit - t/t7600-merge.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4f337e2) | patch
Add test-script for git-merge porcelain
authorLars Hjemli <hjemli@gmail.com>
Sun, 23 Sep 2007 22:51:40 +0000 (00:51 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2007 00:14:03 +0000 (17:14 -0700)
commita85d1b69172f397e815e1ce02db41e4b82b86162
tree1bd38124b7d5a234e58e6cda7cfbdbc0c5389276tree | snapshot
parent4f337e24662f07513fd6e8388f27f13dbe44cadccommit | diff
Add test-script for git-merge porcelain

This test-script excercises the porcelainish aspects of git-merge, and
does it thoroughly enough to detect a small bug already noticed by Junio:
squashing an octopus generates a faulty .git/SQUASH_MSG.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t7600-merge.sh [new file with mode: 0755] blob
Unnamed repository; edit this file 'description' to name the repository.