Mercurial > hg4j
comparison cmdline/org/tmatesoft/hg/console/Outgoing.java @ 709:497e697636fc
Report merged lines as changed block if possible, not as a sequence of added/deleted blocks. To facilitate access to merge parent lines AddBlock got mergeLineAt() method that reports index of the line in the second parent (if any), while insertedAt() has been changed to report index in the first parent always
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Wed, 21 Aug 2013 16:23:27 +0200 |
parents | 45dc79e545f5 |
children |
comparison
equal
deleted
inserted
replaced
708:4ffc17c0b534 | 709:497e697636fc |
---|