Mercurial > hg > Members > shoshi > TreeCMSv2

comparison src/treecms/merger/ReplaceMerger.java @ 17:168deb591f21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit
author shoshi
date Tue, 24 May 2011 00:33:12 +0900
parents 5fa718b63cd5
children 9cb971a68cc5
comparison
equal deleted inserted replaced
16:bb9760760744 17:168deb591f21
1 package treecms.merger; 1 package treecms.merger;
2 2
3 import treecms.api.Node; 3 import treecms.api.Node;
4 4
5 public class ReplaceMerger implements Merger 5 public class ReplaceMerger<T extends Node<T>> implements Merger<T>
6 { 6 {
7 public Node merge(Node _from,Node _to) 7 public T merge(T _tree1,T _tree2)
8 { 8 {
9 return _from; 9 return _tree1;
10 } 10 }
11 } 11 }