diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-06-27 09:56:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-27 09:56:52 -0700 |
| commit | 3ec9150a8cff7ec2531e853b00407f40ca3624ab (patch) | |
| tree | 15984f7c43d087c108c3687abddd68ac4ffd60ad /mergetools/diffmerge | |
| parent | Merge branch 'lv/status-say-working-tree-not-directory' (diff) | |
| parent | rebase: update comment about FreeBSD /bin/sh (diff) | |
| download | tgif-3ec9150a8cff7ec2531e853b00407f40ca3624ab.tar.xz | |
Merge branch 'em/newer-freebsd-shells-are-fine-with-returns'
Comments about misbehaving FreeBSD shells have been clarified with
the version number (9.x and before are broken, newer ones are OK).
* em/newer-freebsd-shells-are-fine-with-returns:
rebase: update comment about FreeBSD /bin/sh
Diffstat (limited to 'mergetools/diffmerge')
0 files changed, 0 insertions, 0 deletions