diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-17 00:05:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-17 14:21:22 -0700 |
| commit | 47579efc009c6f7afaf31be107eb92395a4f10db (patch) | |
| tree | bc4e0adc1980b40c39585277687296000783e414 /merge-recursive.c | |
| parent | a129d96f4144215711e379565af97f6a82197f4f (diff) | |
| download | git-47579efc009c6f7afaf31be107eb92395a4f10db.tar.gz git-47579efc009c6f7afaf31be107eb92395a4f10db.tar.xz | |
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 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions