![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Petr Baudis <pasky@suse.cz> | |
| Sat, 23 Sep 2006 22:25:19 +0000 (00:25 +0200) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 24 Sep 2006 06:52:53 +0000 (23:52 -0700) | ||
| commit | 8f41db8c370d535ed0132ef33d73e47edcc5af03 | |
| tree | 116cbda1095e5c15dbe8374c4196487a776852c2 | tree | snapshot |
| parent | 3fc8284e2114624f2657142b3fecdc6f514b2090 | commit | diff |
Deprecate git-resolve.sh
Seriously, is anyone still using this thing? It's collecting dust and
blocking the name for something potentially useful like a tool for
user-friendly marking of resolved conflicts or resolving index conflicts.
We've loved you when Git was young, now thank you and please go away. ;-)
This makes git-resolve.sh print a big deprecation warning and sleep a bit
for extra annoyance. It should be removed completely after the next release.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Seriously, is anyone still using this thing? It's collecting dust and
blocking the name for something potentially useful like a tool for
user-friendly marking of resolved conflicts or resolving index conflicts.
We've loved you when Git was young, now thank you and please go away. ;-)
This makes git-resolve.sh print a big deprecation warning and sleep a bit
for extra annoyance. It should be removed completely after the next release.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-resolve.sh | diff | blob | history |