| commit | e32faa8adbc8ba9803088e849bc26680134c853c | |
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 20 Dec 2005 02:03:31 +0000 (19 18:03 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 20 Dec 2005 02:05:49 +0000 (19 18:05 -0800) | ||
| tree | 34d0211f016fa52223cbfd9101a57004ed40f6cc | treesnapshot (tar.gz zip) |
| parent | ba922ccee7565c949b4db318e5c27997cbdbfdba | commitdiff |
Remove "octopus".
We still advertise "git resolve" as a standalone command, but never
"git octopus", so nobody should be using it and it is safe to
retire it. The functionality is still available as a strategy
backend.
Signed-off-by: Junio C Hamano <junkio@cox.net>
We still advertise "git resolve" as a standalone command, but never
"git octopus", so nobody should be using it and it is safe to
retire it. The functionality is still available as a strategy
backend.
Signed-off-by: Junio C Hamano <junkio@cox.net>