![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 1 Dec 2009 20:47:01 +0000 (12:47 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 1 Dec 2009 20:47:01 +0000 (12:47 -0800) | ||
| commit | 36a83f375bc247a09f46de0445a138d5e6de8a4f | |
| tree | e64aafa7ba59dedb651aa79b4b96483b855089af | tree | snapshot |
| parent | 4a2775974ae47b69768b6bf5c5c75539409bb289 | commit | diff |
| parent | b81e00a965c62ca72a4b9db425ee173de147808d | commit | diff |
Merge branch 'jc/deprecate-old-syntax-from-merge'
* jc/deprecate-old-syntax-from-merge:
git-merge: a deprecation notice of the ancient command line syntax
* jc/deprecate-old-syntax-from-merge:
git-merge: a deprecation notice of the ancient command line syntax
| builtin-merge.c | diff1 | | diff2 | | blob | history |