diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-08 13:30:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-08 13:30:31 -0700 |
| commit | c8f491668e46d66290aec97caaf94fe2c1ecccbd (patch) | |
| tree | f2b793ddaf748fd0d11c2394d9fb24ecbd07d68a /builtin/merge.c | |
| parent | 85246a7054a6d20a1dc7ccc31e382493332374a4 (diff) | |
| parent | 8174627b3d32dc80cb477b3fa46971955f26c6b2 (diff) | |
| download | git-c8f491668e46d66290aec97caaf94fe2c1ecccbd.tar.gz | |
Merge branch 'dd/diff-files-unmerged-fix'
"git diff --relative" segfaulted and/or produced incorrect result
when there are unmerged paths.
* dd/diff-files-unmerged-fix:
diff-lib: ignore paths that are outside $cwd if --relative asked
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions