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 2a68a865 commit. Signed-off-by: NJunio C Hamano <junkio@cox.net>
Showing
想要评论请 注册 或 登录