summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-09-12 16:18:47 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-09-12 16:18:47 -0700
commit97a7a82f199f165f85fe39a3c318b18c621e6335 (patch)
tree9e82cb4224e653bdbe03ee0bb01b05e7480baee8 /Documentation/merge-config.txt
parentMerge branch 'ho/maint-dashless' into maint (diff)
downloadtgif-97a7a82f199f165f85fe39a3c318b18c621e6335.tar.xz
GIT 1.6.0.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions