| commit | 1affea4f629537fd48e3bd66de89a6f45d0fcd82 | |
| author | Clemens Buchacher <drizzd@aon.at> | |
| Thu, 13 Mar 2008 22:47:41 +0000 (13 23:47 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 14 Mar 2008 06:41:16 +0000 (13 23:41 -0700) | ||
| tree | fa0a6eab955f3c558906b2c90339dc0794536ce4 | treesnapshot (tar.gz zip) |
| parent | bb12ac5120b657691b71108cef3e586ba0b76af6 | commitdiff |
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>
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>
| merge-recursive.c | diffblobblamehistory | |
| t/t6031-merge-recursive.sh | [new file with mode: 0755] | blob |