git-revert with conflicts to behave as git-merge with conflicts
authorLuben Tuikov <ltuikov@yahoo.com>
Thu, 12 Oct 2006 21:52:42 +0000 (14:52 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 16 Oct 2006 06:06:31 +0000 (23:06 -0700)
commita9cb3c6...cb97c4734423045f47899e03f135d3bd
treefa2f08d...c9932d1d5e20bedcecc2e40e17bc2d25copy hash to clipboard (tree)
parent1974bf6...0b436b014bfe86179ff76485610a4887copy hash to clipboard (diff)
git-commit.sh
git-revert.sh