projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8ec0dd6) | patch
Add a new test for git-merge-resolve
authorMiklos Vajna <vmiklos@frugalware.org>
Sat, 12 Jul 2008 22:33:35 +0000 (00:33 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Jul 2008 20:49:31 +0000 (13:49 -0700)
commit3f4d1c639347317788f2c5080f89de53772499ce
tree3812a74b83ad69a7ef31fe65e4b2338829d744fdtree | snapshot
parent8ec0dd66fa277615fe79ad10096d81edb263d6d1commit | diff
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>
t/t7605-merge-resolve.sh [new file with mode: 0755] blob
Git—the stupid content tracker