| commit | 558643e1d67496e72540c61b90d1f38067323fbf | |
| author | Jens Lehmann <Jens.Lehmann@web.de> | |
| Sun, 15 Jun 2014 16:59:20 +0000 (15 18:59 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 14 Jul 2014 19:06:15 +0000 (14 12:06 -0700) | ||
| tree | d1e53bc0ab231f02e0aae7bd803346929a388252 | treesnapshot (tar.gz zip) |
| parent | d78ecca5206c65aff55573029b9fa2dd9c9cf4e1 | commitdiff |
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>
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>
| t/t4137-apply-submodule.sh | [new file with mode: 0755] | blob |