| commit | c7ee859c6e671aaa52bd469528aea8a4e8728a77 | [log] [tgz] |
|---|---|---|
| author | Sasa Zivkov <sasa.zivkov@sap.com> | Fri Jun 22 17:05:48 2012 +0200 |
| committer | Sasa Zivkov <sasa.zivkov@sap.com> | Tue Jun 26 11:30:04 2012 +0200 |
| tree | b054e7eb364285541366a8194fea3f3bf074f25d | |
| parent | 19b538dbb432da9699d0ed20b53f2ae0bb621a2b [diff] |
Make sure we use only one type of NoteMerger for review notes creation. At some point in time the DefaultNoteMerger from jgit was copied to Gerrit, named ReviewNoteMerger and was slightly modified. Since then Gerrit used the ReviewNoteMerger when updating existing notes and DefaultNoteMerger when resolving conflicts on ref-update. This change fixes this small inconsistency. Change-Id: Ic460e01d3a00c7eb35ad2a523607f8ba0e55a176 Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>