![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 2 Dec 2009 18:30:12 +0000 (10:30 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 2 Dec 2009 18:30:12 +0000 (10:30 -0800) | ||
| commit | 0748494e866041034605aaf177f29a61bdc25951 | |
| tree | e48f6c091a7231ae0db5d643215df16c5bd7a8d9 | tree | snapshot |
| parent | c86485dd15d54fc6ff2cd0dda3b2a9faa4f2d66e | commit | diff |
| parent | 28044baba6d268d91057398ffa041ee1b931a5e0 | commit | diff |
Merge branch 'maint'
* maint:
Prepare for 1.6.5.4
merge: do not add standard message when message is given with -m option
Do not misidentify "git merge foo HEAD" as an old-style invocation
Conflicts:
RelNotes
* maint:
Prepare for 1.6.5.4
merge: do not add standard message when message is given with -m option
Do not misidentify "git merge foo HEAD" as an old-style invocation
Conflicts:
RelNotes
| builtin-merge.c | diff1 | | diff2 | | blob | history |