summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2008-10-13 05:35:59 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-10-13 08:43:04 -0700
commit80bfd76af7ac817d4a4b9b7d54485076897c9a67 (patch)
tree497831cc9b18a2574a5dd1e7104b7561a2c67a5e /Documentation/merge-config.txt
parentMerge branch 'maint' (diff)
downloadtgif-80bfd76af7ac817d4a4b9b7d54485076897c9a67.tar.xz
tests: shell negation portability fix
Commit 969c8775 introduced a test which uses the non-portable construct: command1 && ! command2 | command3 which must be command1 && ! (command2 | command3) to work on bsd shells (this is another example of bbf08124, which fixed several similar cases). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions