![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Lars Hjemli <hjemli@gmail.com> | |
| Sun, 23 Sep 2007 22:51:40 +0000 (00:51 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 24 Sep 2007 00:14:03 +0000 (17:14 -0700) | ||
| commit | a85d1b69172f397e815e1ce02db41e4b82b86162 | |
| tree | 1bd38124b7d5a234e58e6cda7cfbdbc0c5389276 | tree | snapshot |
| parent | 4f337e24662f07513fd6e8388f27f13dbe44cadc | commit | 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>
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 |