diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-01 05:48:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-01 05:48:40 -0800 |
| commit | 3827210b91a7d363ea67bcf0b9c6ee1c91d2f3c5 (patch) | |
| tree | d142cd6449c93a48abd928ddeb809d23c952d08f /git.c | |
| parent | 42e778bfec68d251b777c6b8444cda4bc51332be (diff) | |
| parent | 162eba8b43a0e665c8e3439191981412815cc6db (diff) | |
| download | git-3827210b91a7d363ea67bcf0b9c6ee1c91d2f3c5.tar.gz | |
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
Diffstat (limited to 'git.c')
0 files changed, 0 insertions, 0 deletions