diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-07-12 22:33:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-13 20:49:31 (GMT) |
| commit | 3f4d1c639347317788f2c5080f89de53772499ce (patch) | |
| tree | 3812a74b83ad69a7ef31fe65e4b2338829d744fd /commit.c | |
| parent | 8ec0dd66fa277615fe79ad10096d81edb263d6d1 (diff) | |
| download | git-3f4d1c639347317788f2c5080f89de53772499ce.zip git-3f4d1c639347317788f2c5080f89de53772499ce.tar.gz git-3f4d1c639347317788f2c5080f89de53772499ce.tar.bz2 | |
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 'commit.c')
0 files changed, 0 insertions, 0 deletions