summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Patrick Steinhardt <ps@pks.im>2015-05-17 08:56:53 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-05-17 11:24:58 -0700
commit466739195864bf65bf2ca33a6e5637ae40a420fa (patch)
tree062ca3a7fb56b95bce53e29d6082dc5c79aa51ea /git-merge-resolve.sh
parentgit-verify-pack.txt: fix inconsistent spelling of "packfile" (diff)
downloadtgif-466739195864bf65bf2ca33a6e5637ae40a420fa.tar.xz
git-unpack-objects.txt: fix inconsistent spelling of "packfile"
Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions