diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-08 17:36:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-08 17:36:47 -0700 |
| commit | e0226add28e53a35ce91cdbebb1919519f02b291 (patch) | |
| tree | 162a7930fe8651b77fb544afba4a3a636aa8a55e /delta.c | |
| parent | 566487c8a617c12d68bf22c7078bce0b94fc8121 (diff) | |
| download | git-e0226add28e53a35ce91cdbebb1919519f02b291.tar.gz | |
Fix up git-merge-one-file-script
Junio points out that we may need to create the path leading
up the the file we merge.
And we need to be more careful with the "exec"s we've done
to exit on success - only do the on the last command in the
pipeline, not the first one ;)
Diffstat (limited to 'delta.c')
0 files changed, 0 insertions, 0 deletions