diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-17 09:05:00 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-17 23:21:22 +0200 |
| commit | 47579efc009c6f7afaf31be107eb92395a4f10db (patch) | |
| tree | bc4e0adc1980b40c39585277687296000783e414 /git-svn.perl | |
| parent | Allow specifying specialized merge-backend per path. (diff) | |
| download | git-47579efc009c6f7afaf31be107eb92395a4f10db.tar.xz git-47579efc009c6f7afaf31be107eb92395a4f10db.zip | |
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>
Diffstat (limited to 'git-svn.perl')
0 files changed, 0 insertions, 0 deletions