summaryrefslogtreecommitdiff
path: root/Documentation/technical/trivial-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-09-17 16:00:39 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-09-17 16:00:39 -0700
commit5976753e732186d7f8a5c6af55a8ce3e2d2b677b (patch)
tree970f84c69affe9b3ff7ce355ee115b66b728a10f /Documentation/technical/trivial-merge.txt
parentMerge branch 'maint' (diff)
downloadtgif-5976753e732186d7f8a5c6af55a8ce3e2d2b677b.tar.xz
The seventh batch for 1.8.0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions