summaryrefslogtreecommitdiff
path: root/Documentation/technical/trivial-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-11-11 21:34:06 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-11-11 21:34:06 -0800
commitdc865af65f2f97a738a1761d7e9d389101e29e7b (patch)
tree8d151a708e51694dfe458deef90a18696fc76f07 /Documentation/technical/trivial-merge.txt
parentMerge branch 'sn/complete-bash-wo-process-subst' (diff)
parentMerge "Move 'builtin-*' into a 'builtin/' subdirectory" (diff)
downloadtgif-dc865af65f2f97a738a1761d7e9d389101e29e7b.tar.xz
Merge branch 'ly/mktree-using-strbuf'
* ly/mktree-using-strbuf: mktree: fix a memory leak in write_tree()
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions