Bug 24629

Summary:	В списке стратегий merge отсутствует theirs
Product:	Sisyphus	Reporter:	nbr <nbr>
Component:	git	Assignee:	placeholder <placeholder>
Status:	CLOSED NOTABUG	QA Contact:	qa-sisyphus
Severity:	minor
Priority:	P3	CC:	glebfm, ldv, placeholder, vt
Version:	unstable
Hardware:	all
OS:	Linux

Description nbr 2010-11-24 00:45:14 MSK

git merge 4.0-ready -s theirs
Could not find merge strategy 'theirs'.
Available strategies are: octopus ours recursive resolve subtree.

Причем в мануале она есть

Comment 1 Sir Raorn 2010-11-24 00:49:26 MSK

"The recursive strategy can take the following options", сказано в мануале.

Comment 2 Sir Raorn 2010-11-24 00:51:31 MSK

Т.е. -s recursive -X theirs