diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2010-01-22 10:22:29 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-22 13:18:14 -0800 |
| commit | 8cddaeec0d40e68202a6afae5d09024ac1b5db9c (patch) | |
| tree | abac03c9f7a4e90aa217c0b15bf88a005aae0421 /git-merge-resolve.sh | |
| parent | 3bb7256281bb1d291bb705a57dc3f30b26b7c127 (diff) | |
| download | git-8cddaeec0d40e68202a6afae5d09024ac1b5db9c.tar.gz | |
rebase -i: Avoid non-portable "test X -a Y"
Reported by: Eric Blake <ebb9@byu.net>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions