From: Petr Baudis <pasky@suse.cz>
Date: Sat, 23 Sep 2006 22:25:19 +0000 (+0200)
Subject: Deprecate git-resolve.sh
X-Git-Tag: v1.4.3-rc1~48
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8f41db8c370d535ed0132ef33d73e47edcc5af03?ds=inline;hp=8f41db8c370d535ed0132ef33d73e47edcc5af03

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>
---