Mercurial > hg > ConflictEditor
comparison conflict-editor/src/test/resources/single-conflict.json @ 23:8d5f791f1811
do not use findValue as it searches recursively. This is not what we want in all the cases findValue was used before.
author | dirk |
---|---|
date | Sun, 18 Sep 2011 09:37:40 +0200 |
parents | 6f11757c4811 |
children |
comparison
equal
deleted
inserted
replaced
22:eea7df5137ac | 23:8d5f791f1811 |
---|