diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-26 12:26:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-26 12:26:46 -0700 |
| commit | 9831d8f86095edde393e495d7a55cab9d35d5d05 (patch) | |
| tree | 98315fcaee23937a7c6ae9c84d3449d6985738b4 /show-diff.c | |
| parent | 812666c8e66a21e668c0789d0422aa5a7db54961 (diff) | |
| download | git-9831d8f86095edde393e495d7a55cab9d35d5d05.tar.gz | |
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.
Diffstat (limited to 'show-diff.c')
0 files changed, 0 insertions, 0 deletions