diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-30 02:38:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-30 02:38:24 -0800 |
| commit | 0501c2409d7661d2b13f094136d246b9b5b8acf9 (patch) | |
| tree | fecc1f4220d1e79fe623644e9f2b9456f185c684 /ssh-upload.c | |
| parent | 58cce8a85da745e20c9527c569a0e0935ff3ab30 (diff) | |
| download | git-0501c2409d7661d2b13f094136d246b9b5b8acf9.tar.gz | |
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>
Diffstat (limited to 'ssh-upload.c')
0 files changed, 0 insertions, 0 deletions