summaryrefslogtreecommitdiff
path: root/Documentation/technical/trivial-merge.txt
diff options
context:
space:
mode:
authorLibravatar Francis Daly <francis@daoine.org>2006-06-08 00:15:05 +0100
committerLibravatar Junio C Hamano <junkio@cox.net>2006-06-07 16:32:35 -0700
commitb8936cf0605fbcc01cf9f0426e1e078d26f4bde1 (patch)
treeaa964043eebd6cc46b9fb41d3994b096f662586b /Documentation/technical/trivial-merge.txt
parentDocumentation: git-ls-tree (typofix) (diff)
downloadtgif-b8936cf0605fbcc01cf9f0426e1e078d26f4bde1.tar.xz
config.txt grammar, typo, and asciidoc fixes
Nothing major. Signed-off-by: Francis Daly <francis@daoine.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions