diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-11-25 18:44:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-25 18:44:36 -0800 |
| commit | e0a7f2bbbbe9adfc9389c91a58ae44f85538e575 (patch) | |
| tree | 710f7d4ae5549e6fb16ca589510354ecb650213d /git-gui/lib/merge.tcl | |
| parent | f225f9b72092569b12a1921c98142dbdb325abc3 (diff) | |
| parent | cd163d4b4e190d5e5131962c1b8f84601d4736d4 (diff) | |
| download | git-e0a7f2bbbbe9adfc9389c91a58ae44f85538e575.tar.gz git-e0a7f2bbbbe9adfc9389c91a58ae44f85538e575.tar.xz | |
Merge branch 'bc/do-not-recurse-in-die'
* bc/do-not-recurse-in-die:
usage.c: detect recursion in die routines and bail out immediately
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions