aboutsummaryrefslogtreecommitdiffstats
path: root/notes-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-05-13 10:19:48 -0700
committerJunio C Hamano <gitster@pobox.com>2024-05-13 10:19:48 -0700
commitbbffcd45145592350652ef937b12f591fa52808f (patch)
treebc49182d2c70479ed7abba4f16b0075ee38cc92e /notes-merge.c
parentMerge branch 'ps/ci-fuzzers-at-gitlab-fix' (diff)
parentgit-p4: show Perforce error to the user (diff)
downloadgit-bbffcd45145592350652ef937b12f591fa52808f.tar.gz
git-bbffcd45145592350652ef937b12f591fa52808f.zip
Merge branch 'fa/p4-error'
P4 update. * fa/p4-error: git-p4: show Perforce error to the user
Diffstat (limited to 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions