kernel/git - git - PowerEL Git System

Commit Graph

Author	SHA1	Message	Date
Jens Lehmann	558643e1d6	apply: add t4137 for submodule updates Test that the apply command updates the work tree as expected for the '--index' and the '--3way' options (for submodule changes which don't result in conflicts). Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2014-07-14 12:06:15 -07:00

Author

SHA1

Message

Date

Jens Lehmann

558643e1d6

apply: add t4137 for submodule updates

Test that the apply command updates the work tree as expected for the
'--index' and the '--3way' options (for submodule changes which don't
result in conflicts).

Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2014-07-14 12:06:15 -07:00

1 Commits (ecd72042de7d79c05d8f153e288766c7f88f0b10)