aboutsummaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-15 05:55:55 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-15 07:38:35 -0700
commit6c11a5fd465eb64301093de8826c38018b474bde (patch)
treeb680bda21faf6eaf0c5451cc1c869cb48d85cb67 /merge-file.c
parentb526f8ed4de646bb914da43b60322852febde758 (diff)
downloadgit-6c11a5fd465eb64301093de8826c38018b474bde.tar.gz
git-6c11a5fd465eb64301093de8826c38018b474bde.tar.xz
Update draft release notes to 1.6.0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions