log mercurial/merge.py @ 18778:1ef89df2c248

age author description
Fri, 15 Mar 2013 11:23:29 -0700 Durham Goode rebase: fix --collapse when a file was added then removed
Sun, 10 Feb 2013 16:55:01 +0000 Siddharth Agarwal manifestmerge: fix order in which manifests are fetched