![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 1 Jan 2009 13:48:40 +0000 (05:48 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 1 Jan 2009 13:48:40 +0000 (05:48 -0800) | ||
| commit | 3827210b91a7d363ea67bcf0b9c6ee1c91d2f3c5 | |
| tree | d142cd6449c93a48abd928ddeb809d23c952d08f | tree | snapshot |
| parent | 42e778bfec68d251b777c6b8444cda4bc51332be | commit | diff |
| parent | 162eba8b43a0e665c8e3439191981412815cc6db | commit | diff |
Merge branch 'cb/mergetool'
* cb/mergetool:
mergetool: Don't keep temporary merge files unless told to
mergetool: Add prompt to continue after failing to merge a file
Add -y/--no-prompt option to mergetool
Fix some tab/space inconsistencies in git-mergetool.sh
* cb/mergetool:
mergetool: Don't keep temporary merge files unless told to
mergetool: Add prompt to continue after failing to merge a file
Add -y/--no-prompt option to mergetool
Fix some tab/space inconsistencies in git-mergetool.sh
| Documentation/config.txt | diff1 | | diff2 | | blob | history |
| Documentation/git-mergetool.txt | diff1 | | diff2 | | blob | history |
| git-mergetool.sh | diff1 | | diff2 | | blob | history |