commit | f8f2aaa17297d6b21c84641edc2f6135575a003c | [log] [tgz] |
---|---|---|
author | Junio C Hamano <junkio@cox.net> | Tue Feb 13 16:44:27 2007 -0800 |
committer | Junio C Hamano <junkio@cox.net> | Tue Feb 13 16:45:40 2007 -0800 |
tree | 48158676defa9aa697d154c9490069a37f749fde | |
parent | 6132bd5cac91c2a42d67f92fd2e266678c6c8474 [diff] | |
parent | 4cc41a16c15a6d73b13f9211eb8bf49ec869705f [diff] |
Merge branch 'jc/deprecate' As previously announced, diff-stages and resolve are now gone.