diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-03-20 00:03:49 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-03-20 12:35:40 -0700 |
| commit | 8ddc20b8969120329a9369e19816aa9088c9550e (patch) | |
| tree | 35a60e9c8f9690ae3cc731af6fe8c50d19363af5 /commit-reach.c | |
| parent | merge-ort: support subtree shifting (diff) | |
| download | tgif-8ddc20b8969120329a9369e19816aa9088c9550e.tar.xz | |
t6428: new test for SKIP_WORKTREE handling and conflicts
If there is a conflict during a merge for a SKIP_WORKTREE entry, we
expect that file to be written to the working copy and have the
SKIP_WORKTREE bit cleared in the index. If the user had manually
created a file in the working tree despite SKIP_WORKTREE being set, we
do not want to clobber their changes to that file, but want to move it
out of the way. Add tests that check for these behaviors.
Signed-off-by: Elijah Newren <newren@gmail.com>
Reviewed-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit-reach.c')
0 files changed, 0 insertions, 0 deletions