diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-04 13:46:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-04 13:46:44 -0800 |
| commit | 28ab768afafd0d601db444c1d6253fa1b820b55c (patch) | |
| tree | 6764e18e44f86edb265c7dc6da0e78e2d14731d7 /resolve-undo.c | |
| parent | 3978cd06ffcb62ed94e3b3efcc086f8ed623680f (diff) | |
| parent | f3858f8edcb91054cdc0b6f086ec34109582f67f (diff) | |
| download | git-28ab768afafd0d601db444c1d6253fa1b820b55c.tar.gz git-28ab768afafd0d601db444c1d6253fa1b820b55c.tar.xz | |
Merge branch 'nd/clear-gitenv-upon-use-of-alias'
Hotfix for a test breakage made between 2.7 and 'master'.
* nd/clear-gitenv-upon-use-of-alias:
t0001: fix GIT_* environment variable check under --valgrind
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions