]> git.ipfire.org Git - thirdparty/git.git/commit - t/t3512-cherry-pick-submodule.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: cb5918a) | patch
t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure
authorStefan Beller <sbeller@google.com>
Sat, 11 Nov 2017 00:04:43 +0000 (16:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 12 Nov 2017 05:47:45 +0000 (14:47 +0900)
commit89c4ee4e74269635e69c84800ece0f8b754636f6
tree45ded2d35419d8a355d39d299648b4ee8cc196e0tree | snapshot
parentcb5918aa0d50f50e83787f65c2ddc3dcb10159fecommit | diff
t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3512-cherry-pick-submodule.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.