diff options
Diffstat (limited to 'src/checkout.c')
| -rw-r--r-- | src/checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/checkout.c b/src/checkout.c index 1074fe6bb..aad17f8b1 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -1102,7 +1102,7 @@ static int checkout_conflicts_mark_directoryfile( goto done; } - prefixed = git_path_equal_or_prefixed(path, entry->path); + prefixed = git_path_equal_or_prefixed(path, entry->path, NULL); if (prefixed == GIT_PATH_EQUAL) continue; |