summaryrefslogtreecommitdiff
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-18 14:40:12 -0700
committerJunio C Hamano <gitster@pobox.com>2016-05-18 14:40:12 -0700
commit258b862edbacc28bc0ed7543e60ae327ec08299b (patch)
tree55e91884dd9a4e4f088e80293d5044758b17e4ed /resolve-undo.c
parent87c594471d3ee696b0137a851385f091e623b00c (diff)
parent376eb604c266bc49e078aa3a825cb2388bb3e903 (diff)
downloadgit-258b862edbacc28bc0ed7543e60ae327ec08299b.tar.gz
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 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions