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: NJunio C Hamano <junkio@cox.net>
Showing
t/t6026-merge-attr.sh
0 → 100755
想要评论请 注册 或 登录