summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2013-09-20 06:25:00 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-20 11:18:09 -0700
commit42aa29ee12bbc769567c4c8ed694566511ef2e39 (patch)
tree0f94b2d9bb36822c0419df264677b9da5cd103b4 /Documentation/merge-options.txt
parentpush: teach --force-with-lease to smart-http transport (diff)
downloadtgif-42aa29ee12bbc769567c4c8ed694566511ef2e39.tar.xz
t5541: mark passing c-a-s test as success
Commit 05c1eb1 (push: teach --force-with-lease to smart-http transport) fixed the compare-and-swap test in t5541. It tried to mark the test as passing by teaching the test helper function to expect an extra "success or failure" parameter, but forgot to actually use the parameter in the helper. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions