merge-recursive: handle file mode changes
authorClemens Buchacher <drizzd@aon.at>
Thu, 13 Mar 2008 22:47:41 +0000 (23:47 +0100)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Mar 2008 06:41:16 +0000 (23:41 -0700)
commit1affea4...629537fd48e3bd66de89a6f45d0fcd82
treefa0a6ea...955f3c558906b2c90339dc0794536ce4copy hash to clipboard (tree)
parentbb12ac5...20b657691b71108cef3e586ba0b76af6copy hash to clipboard (diff)
merge-recursive.c
t/t6031-merge-recursive.sh [new file with mode: 0755]