diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-09 00:56:09 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-09 00:56:09 (GMT) |
| commit | 98a96b00b88ee35866cd0b1e94697db76bd5ddf9 (patch) | |
| tree | 927deeddf147d85e94c0c6de56e5ad2c57d0a164 /read-tree.c | |
| parent | e0226add28e53a35ce91cdbebb1919519f02b291 (diff) | |
| download | git-98a96b00b88ee35866cd0b1e94697db76bd5ddf9.zip git-98a96b00b88ee35866cd0b1e94697db76bd5ddf9.tar.gz git-98a96b00b88ee35866cd0b1e94697db76bd5ddf9.tar.bz2 | |
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.
Diffstat (limited to 'read-tree.c')
0 files changed, 0 insertions, 0 deletions