diff options
| author |  Miklos Vajna <vmiklos@frugalware.org> | 2008-07-13 00:33:35 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-07-13 13:49:31 -0700 |
| commit | 3f4d1c639347317788f2c5080f89de53772499ce (patch) | |
| tree | 3812a74b83ad69a7ef31fe65e4b2338829d744fd /t/test4012.png | |
| parent | t6021: add a new test for git-merge-resolve (diff) | |
| download | tgif-3f4d1c639347317788f2c5080f89de53772499ce.tar.xz | |
Add a new test for git-merge-resolve
Actually this is a simple test, just to ensure merge-resolve properly
calls read-tree. read-tree itself already has more complex tests.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/test4012.png')
0 files changed, 0 insertions, 0 deletions