![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Thu, 9 Jun 2005 00:56:09 +0000 (17:56 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Thu, 9 Jun 2005 00:56:09 +0000 (17:56 -0700) | ||
| commit | 98a96b00b88ee35866cd0b1e94697db76bd5ddf9 | |
| tree | 927deeddf147d85e94c0c6de56e5ad2c57d0a164 | tree | snapshot |
| parent | e0226add28e53a35ce91cdbebb1919519f02b291 | commit | diff |
One more time.. Clean up git-merge-one-file-script
This uses git-checkout-file to make sure that the full pathname is
created, instead of the script having to verify it by hand. Also,
simplify the 3-way merge case by just writing to the right file and
setting the initial index contents early.
This uses git-checkout-file to make sure that the full pathname is
created, instead of the script having to verify it by hand. Also,
simplify the 3-way merge case by just writing to the right file and
setting the initial index contents early.
| git-merge-one-file-script | diff | blob | history |