| commit | e1355547fd30b21fbdc3fe4e576759683777c4ce | |
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 29 Nov 2005 22:14:42 +0000 (29 14:14 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 29 Nov 2005 22:14:42 +0000 (29 14:14 -0800) | ||
| tree | fe30cc6279cff37e45ae2e4698efc7eb6c7bd380 | treesnapshot (tar.gz zip) |
| parent | 034908047d8c46fb4e1323285b3b066567c7fadc | commitdiff |
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>
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 | diffblobblamehistory |