![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 30 Nov 2005 10:38:24 +0000 (02:38 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 30 Nov 2005 10:38:24 +0000 (02:38 -0800) | ||
| commit | 0501c2409d7661d2b13f094136d246b9b5b8acf9 | |
| tree | fecc1f4220d1e79fe623644e9f2b9456f185c684 | tree | snapshot |
| parent | 58cce8a85da745e20c9527c569a0e0935ff3ab30 | commit | diff |
Tutorial: adjust merge example to recursive strategy.
Current default, merge-recursive, gives slightly different
message while working from merge-resolve which was used to
prepare the illustration in the tutorial.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Current default, merge-recursive, gives slightly different
message while working from merge-resolve which was used to
prepare the illustration in the tutorial.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| Documentation/tutorial.txt | diff | blob | history |