diff options
| author |  Lars Hjemli <hjemli@gmail.com> | 2007-09-24 00:51:40 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-09-23 17:14:03 -0700 |
| commit | a85d1b69172f397e815e1ce02db41e4b82b86162 (patch) | |
| tree | 1bd38124b7d5a234e58e6cda7cfbdbc0c5389276 /grep.h | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-a85d1b69172f397e815e1ce02db41e4b82b86162.tar.xz | |
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 'grep.h')
0 files changed, 0 insertions, 0 deletions