merge.c
74.7 KB
-
Only check for workdir conflicts if the index has merged files · 9a8126e0Passing 0 as the length of the paths to check to git_diff_index_to_workdir results in all files being treated as conflicting, that is, all untracked or modified files in the worktree is reported as conflicting
Jacques Germishuys committed