summaryrefslogtreecommitdiff
path: root/Documentation/technical/trivial-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-01-30 11:53:13 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-01-30 19:02:37 -0800
commit7ed863a85a6ce2c4ac4476848310b8f917ab41f9 (patch)
treeec967269fc022458ec904f83a02ac73af283f87c /Documentation/technical/trivial-merge.txt
parentDon't pass "--xhtml" to hightlight in gitweb.perl script. (diff)
downloadtgif-7ed863a85a6ce2c4ac4476848310b8f917ab41f9.tar.xz
Git 1.7.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions