Staging
v0.7.0
v0.7.0
Revision f37d0cc3ff6ef565f961a0d3741ba016e1ceb31d authored by Luck, Tony on 08 November 2005, 23:52:02 UTC, committed by Junio C Hamano on 09 November 2005, 05:33:36 UTC
"git resolve" is being deprecated in favour of "git merge". Update the documentation to reflect this. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent f4f440a
Computing file changes ...