From: Lars Hjemli Date: Sun, 23 Sep 2007 22:51:40 +0000 (+0200) Subject: Add test-script for git-merge porcelain X-Git-Tag: v1.5.4-rc0~388^2~5 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a85d1b69172f397e815e1ce02db41e4b82b86162?ds=inline;hp=a85d1b69172f397e815e1ce02db41e4b82b86162 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 Signed-off-by: Junio C Hamano ---