Mercurial > hg > Members > shoshi > TreeCMSv2

comparison src/treecms/merger/ReplaceMerger.java @ 27:aecc55e87143 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test commit
author Shoshi TAMAKI <shoshi@cr.ie.u-ryukyu.ac.jp>
date Thu, 18 Aug 2011 17:37:03 +0900
parents 9cb971a68cc5
children
comparison
equal deleted inserted replaced
26:9cb971a68cc5 27:aecc55e87143
1 package treecms.merger; 1 package treecms.merger;
2 2
3 import treecms.api.NodeAttributes; 3 import treecms.api.Node;
4 import treecms.api.NodeChildren;
5 import treecms.api.NodeContext;
6 4
7 public class ReplaceMerger<T extends NodeAttributes & NodeContext & NodeChildren<T>> implements Merger<T> 5 public class ReplaceMerger<T extends Node> implements Merger<T>
8 { 6 {
9 public T merge(T _tree1,T _tree2) 7 public T merge(T _tree1,T _tree2)
10 { 8 {
11 return _tree1; 9 return _tree1;
12 } 10 }