summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-07-31 13:51:05 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-07-31 13:51:05 -0700
commitc6767f45e3e013d34caa63797ef30f6c22c9dd34 (patch)
tree991676cd3d598144ce62b2444fbe79ef400d9c53 /git-merge-resolve.sh
parentMerge branch 'jk/gc-pre-detach-under-hook' into maint (diff)
parentt9700: add tests for Git::unquote_path() (diff)
downloadtgif-c6767f45e3e013d34caa63797ef30f6c22c9dd34.tar.xz
Merge branch 'pw/unquote-path-in-git-pm' into maint
Code refactoring. * pw/unquote-path-in-git-pm: t9700: add tests for Git::unquote_path() Git::unquote_path(): throw an exception on bad path Git::unquote_path(): handle '\a' add -i: move unquote_path() to Git.pm
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions