summaryrefslogtreecommitdiff
path: root/resolve-undo.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-06-05 09:18:13 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-06-05 09:18:14 +0900
commitac935fca90b3258820c6fea9b7892eab184ef9db (patch)
treed5574577f8e664b1e059fd9b2388b96ecb95647a /resolve-undo.h
parentMerge branch 'tb/pull-ff-rebase-autostash' (diff)
parentdocs: fix formatting and grammar (diff)
downloadtgif-ac935fca90b3258820c6fea9b7892eab184ef9db.tar.xz
Merge branch 'ad/pull-remote-doc'
Docfix. * ad/pull-remote-doc: docs: fix formatting and grammar
Diffstat (limited to 'resolve-undo.h')
0 files changed, 0 insertions, 0 deletions