| commit | 1c2c10b6e6d86066d68635a2a968c7162498ea41 | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <junkio@cox.net> | Fri Dec 02 00:50:59 2005 -0800 |
| committer | Junio C Hamano <junkio@cox.net> | Fri Dec 02 01:08:14 2005 -0800 |
| tree | f86926f70f7cc1223c949b773671dc42646717c5 | |
| parent | 57ae0d09ed3c4e409bed78b77322fa5e9bad3f3f [diff] |
merge-one-file: make sure we create the merged file. The "update-index followed by checkout-index" chain served two purposes -- to collapse the index to "our" version, and make sure that file exists in the working tree. In the recent update to leave the index unmerged on conflicting path, we wanted to stop doing the former, but we still need to do the latter (we allow merging to work in an un-checked-out working tree). Signed-off-by: Junio C Hamano <junkio@cox.net>