summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-05-18 14:40:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-18 14:40:12 -0700
commit258b862edbacc28bc0ed7543e60ae327ec08299b (patch)
tree55e91884dd9a4e4f088e80293d5044758b17e4ed /git-merge-resolve.sh
parentMerge branch 'rt/string-list-lookup-cleanup' into HEAD (diff)
parentconfig doc: improve exit code listing (diff)
downloadtgif-258b862edbacc28bc0ed7543e60ae327ec08299b.tar.xz
Merge branch 'sb/config-exit-status-list' into HEAD
Doc update. * sb/config-exit-status-list: config doc: improve exit code listing
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions