| commit | 47579efc009c6f7afaf31be107eb92395a4f10db | |
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 17 Apr 2007 07:05:00 +0000 (17 00:05 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 17 Apr 2007 21:21:22 +0000 (17 14:21 -0700) | ||
| tree | bc4e0adc1980b40c39585277687296000783e414 | treesnapshot (tar.gz zip) |
| parent | a129d96f4144215711e379565af97f6a82197f4f | commitdiff |
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>
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 |