From: Clemens Buchacher <drizzd@aon.at>
Date: Thu, 13 Mar 2008 22:47:41 +0000 (+0100)
Subject: merge-recursive: handle file mode changes
X-Git-Tag: v1.5.5-rc0~17^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1affea4f629537fd48e3bd66de89a6f45d0fcd82?ds=inline;hp=1affea4f629537fd48e3bd66de89a6f45d0fcd82

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>
---