aboutsummaryrefslogtreecommitdiff
path: root/builtin-merge-file.c
diff options
context:
space:
mode:
authorClemens Buchacher <drizzd@aon.at>2008-03-13 23:47:41 +0100
committerJunio C Hamano <gitster@pobox.com>2008-03-13 23:41:16 -0700
commit1affea4f629537fd48e3bd66de89a6f45d0fcd82 (patch)
treefa0a6eab955f3c558906b2c90339dc0794536ce4 /builtin-merge-file.c
parentbb12ac5120b657691b71108cef3e586ba0b76af6 (diff)
downloadgit-1affea4f629537fd48e3bd66de89a6f45d0fcd82.tar.gz
git-1affea4f629537fd48e3bd66de89a6f45d0fcd82.tar.xz
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>
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions