Merge branch 'jc/deprecate'
commitf8f2aaa17297d6b21c84641edc2f6135575a003c
authorJunio C Hamano <junkio@cox.net>
Wed, 14 Feb 2007 00:44:27 +0000 (13 16:44 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 14 Feb 2007 00:45:40 +0000 (13 16:45 -0800)
tree48158676defa9aa697d154c9490069a37f749fde
parent6132bd5cac91c2a42d67f92fd2e266678c6c8474
parent4cc41a16c15a6d73b13f9211eb8bf49ec869705f
Merge branch 'jc/deprecate'

As previously announced, diff-stages and resolve are now gone.