aboutsummaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-24 13:48:51 -0700
committerJunio C Hamano <gitster@pobox.com>2013-06-24 13:48:52 -0700
commitc47d4380c7972bf94bd5ee425c3806398e00cb4d (patch)
tree468efba065b326a2b0146d936cc31006c39a5e83 /git-mergetool.sh
parent515cded0fbdcdd13f1190ed5bf65c296e7dcf8fe (diff)
parente21db2c6ad136a723bed389feb3298b5b4ee1ae4 (diff)
downloadgit-c47d4380c7972bf94bd5ee425c3806398e00cb4d.tar.gz
git-c47d4380c7972bf94bd5ee425c3806398e00cb4d.tar.xz
Merge branch 'jk/doc-build-move-infordir-def'
Makefile cleanup. * jk/doc-build-move-infordir-def: Documentation/Makefile: move infodir to be with other '*dir's Documentation/Makefile: fix spaces around assignments
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions