Merge branch 'jc/deprecate'
As previously announced, diff-stages and resolve are now gone.
Junio C Hamano committed
Feb 13, 2007 at 16:44 UTC
f8f2aaa17297d6b21c84641edc2f6135575a003c
No changes.
As previously announced, diff-stages and resolve are now gone.
No changes.