kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
14,177 Commits
6 Branches
991 Tags
180 MiB
Commit Graph

2 Commits (f8fcb57bb45e8d3d8f7921377d6c2503590efc3c)

Author SHA1 Message Date
Junio C Hamano 1f9ff0de82 Redo "add test_cmp function for test scripts" 
We had a handful test updates since we accepted 82ebb0b (add test_cmp
function for test scripts).  This fixes them up.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-03-15 01:23:26 -07:00
Clemens Buchacher 1affea4f62 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>
 2008-03-13 23:41:16 -07:00