summaryrefslogtreecommitdiff
path: root/builtin-merge-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-10-29 12:02:59 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-10-29 12:02:59 -0700
commite720c4382f6c9317a3b495e80c7dfc609a0db5e6 (patch)
tree12231173faeb8a65b340cd69acfc3fc368376174 /builtin-merge-file.c
parentmerge-recursive.c: mrtree in merge() is not used before set (diff)
downloadtgif-e720c4382f6c9317a3b495e80c7dfc609a0db5e6.tar.xz
RelNotes-1.5.3.5: describe recent fixes
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions