summaryrefslogtreecommitdiff
path: root/Documentation/technical/trivial-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-09-18 14:35:03 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-09-18 14:35:03 -0700
commit3c7d50979abd0fbc8e1d7a1baac4c8a26e440a7c (patch)
tree0bba7ea7112ea6941475c42f76cf5450989767fa /Documentation/technical/trivial-merge.txt
parentThe seventh batch for 1.8.0 (diff)
parentGit 1.7.12.1 (diff)
downloadtgif-3c7d50979abd0fbc8e1d7a1baac4c8a26e440a7c.tar.xz
Sync with 1.7.12.1
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions