3 commits

Author	SHA1	Message	Date
Alex Riesen	28f8802417	Fix t6031 on filesystems without working exec bit ... The point of the test is not really to test the ability of the filesystem to keep the given x-bit, but to check is merge-recursive correctly handles it. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2008-05-21 10:14:51 -07:00
Junio C Hamano	1f9ff0de82	Redo "add test_cmp function for test scripts" ... We had a handful test updates since we accepted 82ebb0b (add test_cmp function for test scripts). This fixes them up. Signed-off-by: Junio C Hamano <gitster@pobox.com>	2008-03-15 01:23:26 -07:00
Clemens Buchacher	1affea4f62	merge-recursive: handle file mode changes ... File mode changes should be handled similarly to changes of content. That is, if the file mode changed in only one branch, keep the changed version, and if both branch changed to different mode, mark it as a conflict. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2008-03-13 23:41:16 -07:00