comparison mercurial/merge.py @ 24001:f610c3bd03d3

trydiff: order header-writing code in same order as output Instead of inserting a line before the others header lines, move the code that writes that line before the code that writes the other lines.
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 16 Jan 2015 14:49:08 -0800
parents 6becb9dbca25
children 1ff35d76421c
comparison
equal deleted inserted replaced
24000:82e3324c4df9 24001:f610c3bd03d3