git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 594a867)
t7405: add a directory/submodule conflict
authorElijah Newren <redacted>
Wed, 11 Jul 2018 03:56:58 +0000 (20:56 -0700)
committerJunio C Hamano <redacted>
Wed, 11 Jul 2018 16:40:03 +0000 (09:40 -0700)
commite81c7d414588e92e3bf871fe6c78a32176dcf995
treedfdd5c6c4210f62eddc21554b2aaefd444c4c4b5tree | snapshot
parent594a8673f227e9a00b3b0c4d6a26c97d68651666commit | diff
t7405: add a directory/submodule conflict

For a directory/submodule conflict, we want contents from both the
directory and the submodule to be present for the user to use to resolve
the conflict, but we do not want paths under the directory being written
into the submodule and we do not want the merge being confused by paths
under the submodule being in the way.  Add testcases for these situations.

Signed-off-by: Elijah Newren <redacted>
Signed-off-by: Junio C Hamano <redacted>
t/t7405-submodule-merge.sh diff | blob | history
git clone https://git.99rst.org/PROJECT