diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-07-10 20:56:58 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-07-11 09:40:03 -0700 |
| commit | e81c7d414588e92e3bf871fe6c78a32176dcf995 (patch) | |
| tree | dfdd5c6c4210f62eddc21554b2aaefd444c4c4b5 /contrib/contacts/.gitignore | |
| parent | t7405: add a file/submodule conflict (diff) | |
| download | tgif-e81c7d414588e92e3bf871fe6c78a32176dcf995.tar.xz | |
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 <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/contacts/.gitignore')
0 files changed, 0 insertions, 0 deletions