3 commits

Author	SHA1	Message	Date
Lars Hjemli	f9fd5210c8	Add tests for branch --[no-]merged ... Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2008-04-20 18:16:46 -07:00
Jeff King	82ebb0b6ec	add test_cmp function for test scripts ... Many scripts compare actual and expected output using "diff -u". This is nicer than "cmp" because the output shows how the two differ. However, not all versions of diff understand -u, leading to unnecessary test failure. This adds a test_cmp function to the test scripts and switches all "diff -u" invocations to use it. The function uses the contents of "$GIT_TEST_CMP" to compare its arguments; the default is "diff -u". On systems with a less-capable diff, you can do: GIT_TEST_CMP=cmp make test Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2008-03-13 00:57:52 -07:00
Junio C Hamano	3f7dfe77b7	git-branch --contains: doc and test ... Signed-off-by: Junio C Hamano <gitster@pobox.com>	2007-11-22 22:11:28 -08:00