Mercurial > hg-stable
log
age | author | description |
---|---|---|
Mon, 24 Nov 2014 16:17:02 -0800 | Martin von Zweigbergk | merge: use None as filename for base in 'both created' conflicts |
Mon, 24 Nov 2014 16:42:36 -0800 | Martin von Zweigbergk | merge: break out "both renamed a -> b" case |