projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0349080) | patch
applymbox: typofix to enable -m option.
authorJunio C Hamano <junkio@cox.net>
Tue, 29 Nov 2005 22:14:42 +0000 (14:14 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 29 Nov 2005 22:14:42 +0000 (14:14 -0800)
commite1355547fd30b21fbdc3fe4e576759683777c4ce
treefe30cc6279cff37e45ae2e4698efc7eb6c7bd380tree | snapshot
parent034908047d8c46fb4e1323285b3b066567c7fadccommit | diff
applymbox: typofix to enable -m option.

The -m option to fall back on 3-way merge was not honoured at
all because of a typo.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-applymbox.sh diff | blob | history
The core git plumbing