Linus Torvalds 9831d8f860 git-pull-script: do automatic merges ...

When the trivial "read-tree" merge fails, fall back on the (equally
trivial) automatic merge script instead of forcing the user to do
it by hand.

When _that_ fails, you get to do a manual merge.

2005-04-26 12:26:46 -07:00

1.7 KiB

Executable File

Raw Blame History

View Raw