git-for-windows/git - git - Gitea: Self-hosted GitHub

git-for-windows/git

Fork 0

mirror of https://github.com/git-for-windows/git.git synced 2025-12-14 18:43:41 -06:00

Commit Graph

Author	SHA1	Message	Date
Fredrik Kuivinen	e4cf17ce0d	[PATCH] Rename the 'fredrik' merge strategy to 'recursive'. Otherwise we would regret when Fredrik comes up with another merge algorithm with different pros-and-cons with the current one. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>	2005-09-13 00:20:54 -07:00

Author

SHA1

Message

Date

Fredrik Kuivinen

e4cf17ce0d

[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.

Otherwise we would regret when Fredrik comes up with another merge
algorithm with different pros-and-cons with the current one.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

2005-09-13 00:20:54 -07:00

1 Commits