summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-04 13:03:50 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-04 13:03:50 -0700
commitbfd70c53b38f03a4e788fb84518c09f67b7514c2 (patch)
tree4f48f0541e7a2d1ce50263e78cc5479ce52a1553 /git-mergetool--lib.sh
parentUpdate draft release notes to 1.8.3 (diff)
parentmailmap: update Pasky's address (diff)
downloadtgif-bfd70c53b38f03a4e788fb84518c09f67b7514c2.tar.xz
Sync with maint
* maint: mailmap: update Pasky's address git-remote-mediawiki: new wiki URL in documentation
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions