summaryrefslogtreecommitdiff
path: root/convert-objects.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-06 07:26:10 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-06 07:26:10 (GMT)
commitbb6d7b893e7f9f22e58a63d871b5b4c87b887513 (patch)
tree7c2f662dc008d054344fd99a38d392c668617cf5 /convert-objects.c
parent5f6da1d9d2b073c72d3588518934ade16df51268 (diff)
downloadgit-bb6d7b893e7f9f22e58a63d871b5b4c87b887513.zip
git-bb6d7b893e7f9f22e58a63d871b5b4c87b887513.tar.gz
git-bb6d7b893e7f9f22e58a63d871b5b4c87b887513.tar.bz2
Documentaiton (read-tree): update description of 3-way
The merge-one-file used to leave the working tree intact, but it has long been changed to leave the merge result there since 2a68a8659f7dc55fd285d235ae2d19e7a8116c30 commit. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'convert-objects.c')
0 files changed, 0 insertions, 0 deletions