diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-13 22:56:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-13 22:56:22 -0800 |
| commit | b661a4bc1e172a9c67bf62bdc2715bd4efbc16e5 (patch) | |
| tree | 5104d722f0547044c3f129bc49f866aa7498d114 /git-mergetool--lib.sh | |
| parent | Merge branch 'nd/ignore-might-be-precious' (diff) | |
| parent | builtin/apply.c: report error on failure to recognize input (diff) | |
| download | tgif-b661a4bc1e172a9c67bf62bdc2715bd4efbc16e5.tar.xz | |
Merge branch 'bc/maint-apply-check-no-patch'
* bc/maint-apply-check-no-patch:
builtin/apply.c: report error on failure to recognize input
t/t4131-apply-fake-ancestor.sh: fix broken test
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions