Commit ff63b1c
committed
merge-ort: ignore skip-worktree bit with virtual filesystem
Without this change, the mere conflicts start creating <path>~cruft
files on-disk, which is caught by the VFS for Git functional tests.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>1 parent 4bee73f commit ff63b1c
1 file changed
+1
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4143 | 4143 | | |
4144 | 4144 | | |
4145 | 4145 | | |
4146 | | - | |
| 4146 | + | |
4147 | 4147 | | |
4148 | 4148 | | |
4149 | 4149 | | |
| |||
0 commit comments