author | Junio C Hamano <junkio@cox.net> | |
Wed, 14 Feb 2007 00:44:27 +0000 (16:44 -0800) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Wed, 14 Feb 2007 00:45:40 +0000 (16:45 -0800) |
As previously announced, diff-stages and resolve are now gone.
Trivial merge