diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-11-29 14:14:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-29 14:14:42 -0800 |
| commit | e1355547fd30b21fbdc3fe4e576759683777c4ce (patch) | |
| tree | fe30cc6279cff37e45ae2e4698efc7eb6c7bd380 /git-merge-ours.sh | |
| parent | SVN import: Use one log call (diff) | |
| download | tgif-e1355547fd30b21fbdc3fe4e576759683777c4ce.tar.xz | |
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>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions