]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a129d96) | patch
Add a demonstration/test of customized merge.
authorJunio C Hamano <junkio@cox.net>
Tue, 17 Apr 2007 07:05:00 +0000 (00:05 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 17 Apr 2007 21:21:22 +0000 (14:21 -0700)
commit47579efc009c6f7afaf31be107eb92395a4f10db
treebc4e0adc1980b40c39585277687296000783e414tree | snapshot
parenta129d96f4144215711e379565af97f6a82197f4fcommit | diff
Add a demonstration/test of customized merge.

This demonstrates how the new low-level per-path merge backends,
union and ours, work, and shows how they are controlled by the
gitattribute mechanism.

Signed-off-by: Junio C Hamano <junkio@cox.net>
t/t6026-merge-attr.sh [new file with mode: 0755] blob
Unnamed repository; edit this file 'description' to name the repository.