kernel/git - git - PowerEL Git System

Commit Graph

Author	SHA1	Message	Date
Miklos Vajna	3f4d1c6393	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>	2008-07-13 13:49:31 -07:00

Author

SHA1

Message

Date

Miklos Vajna

3f4d1c6393

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>

2008-07-13 13:49:31 -07:00

1 Commits (6e94e6835f397cd2602ca1eb12002e51aa6b0500)