Mercurial > hg > ConflictEditor
diff conflict-editor/src/test/resources/single-conflict.json @ 37:76b2dafcb1b4
add a comment why we discard the index here
author | dirk |
---|---|
date | Fri, 07 Oct 2011 05:59:38 +0200 |
parents | 6f11757c4811 |
children |
author | dirk |
---|---|
date | Fri, 07 Oct 2011 05:59:38 +0200 |
parents | 6f11757c4811 |
children |