summaryrefslogtreecommitdiff
path: root/Documentation/git-daemon.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-10-27 04:47:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-10-27 04:47:11 (GMT)
commit0141215c9b1b95b6b9619358ab13e0f56e1cd01c (patch)
treea3e096b778f2c87cf694126df2a3d36ce600016b /Documentation/git-daemon.txt
parent91e811e0e80e55d580ba3601176ac84b28ad4479 (diff)
parent000866909a5d9233c89d8fcc33a8125cc84f24d6 (diff)
downloadgit-0141215c9b1b95b6b9619358ab13e0f56e1cd01c.zip
git-0141215c9b1b95b6b9619358ab13e0f56e1cd01c.tar.gz
git-0141215c9b1b95b6b9619358ab13e0f56e1cd01c.tar.bz2
Merge branch 'dm/mergetool-vimdiff'
* dm/mergetool-vimdiff: mergetool-lib: make the three-way diff the default for vim/gvim mergetool-lib: add a three-way diff view for vim/gvim mergetool-lib: combine vimdiff and gvimdiff run blocks
Diffstat (limited to 'Documentation/git-daemon.txt')
0 files changed, 0 insertions, 0 deletions