diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-05 23:26:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-05 23:26:10 -0800 |
| commit | bb6d7b893e7f9f22e58a63d871b5b4c87b887513 (patch) | |
| tree | 7c2f662dc008d054344fd99a38d392c668617cf5 /git-merge-one-file.sh | |
| parent | 5f6da1d9d2b073c72d3588518934ade16df51268 (diff) | |
| download | git-bb6d7b893e7f9f22e58a63d871b5b4c87b887513.tar.gz git-bb6d7b893e7f9f22e58a63d871b5b4c87b887513.tar.xz | |
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 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions