diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-07-27 21:17:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-27 21:17:00 -0700 |
| commit | 12688bbacf8a5b221748a1dfa31eb3cef9f9162d (patch) | |
| tree | fedd965bfba96473d7dea3df7405b04ee1eb6c5e /git-merge-one-file.sh | |
| parent | Merge branch 'jk/help-plug-memleak' (diff) | |
| parent | t7502: test early quit from commit with bad ident (diff) | |
| download | tgif-12688bbacf8a5b221748a1dfa31eb3cef9f9162d.tar.xz | |
Merge branch 'jk/autoident-test'
Fix test breakages by a builder who does not have a valid user name
in his /etc/password entry.
* jk/autoident-test:
t7502: test early quit from commit with bad ident
t7502: handle systems where auto-identity is broken
t7502: drop confusing test_might_fail call
t7502: narrow checks for author/committer name in template
t7502: properly quote GIT_EDITOR
t7502: clean up fake_editor tests
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions