| commit | 0501c2409d7661d2b13f094136d246b9b5b8acf9 | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <junkio@cox.net> | Wed Nov 30 02:38:24 2005 -0800 |
| committer | Junio C Hamano <junkio@cox.net> | Wed Nov 30 02:38:24 2005 -0800 |
| tree | fecc1f4220d1e79fe623644e9f2b9456f185c684 | |
| parent | 58cce8a85da745e20c9527c569a0e0935ff3ab30 [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>