aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-08-22 13:13:20 -0700
committerJunio C Hamano <gitster@pobox.com>2025-08-22 13:13:20 -0700
commitd08436df5f686c0d9419717eaeba16bb4ebb3719 (patch)
treed92f517ae26a7661d516c0c7dba6228a9ee02ee3 /builtin/merge.c
parentMerge branch 'ms/refs-list' (diff)
parentgit-jump: make `diff` work with filenames containing spaces (diff)
downloadgit-d08436df5f686c0d9419717eaeba16bb4ebb3719.tar.gz
git-d08436df5f686c0d9419717eaeba16bb4ebb3719.zip
Merge branch 'gh/git-jump-pathname-with-sp'
"git jump" (in contrib/) fails to parse the diff header correctly when a file has a space in its name, which has been corrected. * gh/git-jump-pathname-with-sp: git-jump: make `diff` work with filenames containing spaces
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions