diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-03 12:06:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-03 12:06:43 -0700 |
| commit | 22e91ba81538010e471855889b3272195c663d94 (patch) | |
| tree | 4ee15ed8f98b480c37530c5447867bb5827ecea8 /git-gui/lib/diff.tcl | |
| parent | 3a9dae783bb66c18409d42d07949456dde8c4c62 (diff) | |
| parent | 27bd38d4e5a44da233a9e7d01c6a518aba355297 (diff) | |
Merge branch 'lr/git-run-setup-gently'
* lr/git-run-setup-gently:
git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive
Diffstat (limited to 'git-gui/lib/diff.tcl')
0 files changed, 0 insertions, 0 deletions