| commit | e4cf17ce0db2dab7c9525a732f86c5e3df3b4ed0 | |
| author | Fredrik Kuivinen <freku045@student.liu.se> | |
| Tue, 13 Sep 2005 06:22:26 +0000 (13 08:22 +0200) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 13 Sep 2005 07:20:54 +0000 (13 00:20 -0700) | ||
| tree | e311046e26ff830a2232067e6ad00ba06db95e2d | treesnapshot (tar.gz zip) |
| parent | f88ed172e7a391bd907798ad2a3347a83cd24317 | commitdiff |
[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>
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>
| .gitignore | diffblobblamehistory | |
| Makefile | diffblobblamehistory | |
| git-merge-recursive.py | [moved from git-merge-fredrik.py with 100% similarity] | blobblamehistory |
| git-merge.sh | diffblobblamehistory |