diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-10-03 22:28:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-04 17:04:44 -0700 |
| commit | c2d5036de5c2e21fb736002ae5b385ceb7c6b23b (patch) | |
| tree | 79850cb02b25c4045feddaefe408aed22a7101e5 /test-delta.c | |
| parent | 56d33b1105e63590577672de9afb920f6e7fd22c (diff) | |
| download | git-c2d5036de5c2e21fb736002ae5b385ceb7c6b23b.tar.gz git-c2d5036de5c2e21fb736002ae5b385ceb7c6b23b.tar.xz | |
git-apply: retire unused/unimplemented --no-merge flag.
The original plan was to do 3-way merge between local working tree,
index and the patch being applied, but that was never implemented.
Retire the flag to control its behaviour.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'test-delta.c')
0 files changed, 0 insertions, 0 deletions