diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-27 01:03:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-27 01:03:21 -0800 |
| commit | 0c3473561610ac9f94c65f64178d2a66ee73eb64 (patch) | |
| tree | f9a0e7206274b34946cc459683604c5f549a58f0 /builtin-merge-recursive.c | |
| parent | 2d56a136435bd40f9b6b75103eb4d75003154c9f (diff) | |
| parent | 1b249ffe8dff12849e3e215b46b245daecfadba0 (diff) | |
| download | git-0c3473561610ac9f94c65f64178d2a66ee73eb64.tar.gz git-0c3473561610ac9f94c65f64178d2a66ee73eb64.tar.xz | |
Merge branch 'cc/maint-1.6.0-bisect-fix'
* cc/maint-1.6.0-bisect-fix:
bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped
Conflicts:
git-bisect.sh
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions