Linus Torvalds 98a96b00b8 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.

2005-06-08 17:56:09 -07:00

1.8 KiB

Executable File

Raw Blame History

View Raw