diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-13 22:55:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-13 22:55:07 -0800 |
| commit | 424f30a5ae3ff26fca14df71cce31b06d1dec919 (patch) | |
| tree | d4c464ab476a9847fe5f70a747864a0e386020b0 /git-mergetool--lib.sh | |
| parent | Merge branch 'jn/branch-move-to-self' (diff) | |
| parent | checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore (diff) | |
| download | tgif-424f30a5ae3ff26fca14df71cce31b06d1dec919.tar.xz | |
Merge branch 'nd/ignore-might-be-precious'
* nd/ignore-might-be-precious:
checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions