summaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-02-11 19:21:23 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-02-11 19:21:23 -0800
commitecb879f8772d5970bf1eb3677f9c9ebdd6e116a1 (patch)
treea53a575ef0e198eaee52c54132c8bcc1803159ee /merge-file.c
parentMerge branch 'db/no-separate-ls-remote-connection' (early part) (diff)
downloadtgif-ecb879f8772d5970bf1eb3677f9c9ebdd6e116a1.tar.xz
Update the main documentation (stale notes section)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions