| commit | 3f4d1c639347317788f2c5080f89de53772499ce | |
| author | Miklos Vajna <vmiklos@frugalware.org> | |
| Sat, 12 Jul 2008 22:33:35 +0000 (13 00:33 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 13 Jul 2008 20:49:31 +0000 (13 13:49 -0700) | ||
| tree | 3812a74b83ad69a7ef31fe65e4b2338829d744fd | treesnapshot (tar.gz zip) |
| parent | 8ec0dd66fa277615fe79ad10096d81edb263d6d1 | commitdiff |
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>
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>
| t/t7605-merge-resolve.sh | [new file with mode: 0755] | blob |