diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2007-09-23 22:51:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-24 00:14:03 (GMT) |
| commit | a85d1b69172f397e815e1ce02db41e4b82b86162 (patch) | |
| tree | 1bd38124b7d5a234e58e6cda7cfbdbc0c5389276 /git-merge.sh | |
| parent | 4f337e24662f07513fd6e8388f27f13dbe44cadc (diff) | |
| download | git-a85d1b69172f397e815e1ce02db41e4b82b86162.zip git-a85d1b69172f397e815e1ce02db41e4b82b86162.tar.gz git-a85d1b69172f397e815e1ce02db41e4b82b86162.tar.bz2 | |
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>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions