summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-03-28 13:52:27 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-28 13:52:28 -0700
commitfb0ab976c6ffcea3b7b15dd668c6cac2e4e3bdc9 (patch)
treee7ad47f441d89a8d715fa666e07d1468cfabc8b6 /git-merge-resolve.sh
parentMerge branch 'rs/path-name-safety-cleanup' into maint (diff)
parentshortlog: don't set after_subject to an empty string (diff)
downloadtgif-fb0ab976c6ffcea3b7b15dd668c6cac2e4e3bdc9.tar.xz
Merge branch 'rs/shortlog-cleanup' into maint
Code clean-up. * rs/shortlog-cleanup: shortlog: don't set after_subject to an empty string
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions