diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-07-16 23:52:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-16 23:52:09 -0700 |
| commit | eed46644ca48ad08e1fd71e14afbe801399e8a67 (patch) | |
| tree | 0c0de6b7e698f87684ab1025236f698230035d9f /git-merge-one-file.sh | |
| parent | c28c571c143a5145665f4bf334671ac3a7d0980c (diff) | |
| download | git-eed46644ca48ad08e1fd71e14afbe801399e8a67.tar.gz | |
apply: split out removal and creation into different phases.
This reworks write_out_result() loop so we first remove the paths that
are to go away and then create them after finishing all the removal.
This is necessary when a patch creates a file "foo" and removes a file
"foo/bar".
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions