diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-09-20 12:34:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-20 12:34:37 -0700 |
| commit | f26f250b442b57d0e6d9295bb98690ce70640759 (patch) | |
| tree | 97cbfc19ead16946bc30b7f5f8c56290f6b199f8 /mergetools/gvimdiff2 | |
| parent | Merge branch 'jh/checkout-auto-tracking' (diff) | |
| parent | rebase: fix run_specific_rebase's use of "return" on FreeBSD (diff) | |
| download | tgif-f26f250b442b57d0e6d9295bb98690ce70640759.tar.xz | |
Merge branch 'mm/rebase-continue-freebsd-WB'
Work around a bug in FreeBSD shell that caused a regression to "git
rebase" in v1.8.4. May need to be later applied to 'maint'.
* mm/rebase-continue-freebsd-WB:
rebase: fix run_specific_rebase's use of "return" on FreeBSD
Diffstat (limited to 'mergetools/gvimdiff2')
0 files changed, 0 insertions, 0 deletions