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: NClemens Buchacher <drizzd@aon.at> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
Showing
t/t6031-merge-recursive.sh
0 → 100755
想要评论请 注册 或 登录