Re: [thg-dev] Merge when a file moves

2009-09-15 Thread Peer Sommerlund
2009/9/15 Steve Borho > On Tue, Sep 15, 2009 at 5:43 AM, Peer Sommerlund > wrote: > > I have a small question about the commit dialog. > > > > If I merge two branches where one moves a file and the other changes it > at > > its old location, then the commit dialog diff pane will show a diff that

Re: [thg-dev] Merge when a file moves

2009-09-15 Thread Steve Borho
On Tue, Sep 15, 2009 at 5:43 AM, Peer Sommerlund wrote: > I have a small question about the commit dialog. > > If I merge two branches where one moves a file and the other changes it at > its old location, then the commit dialog diff pane will show a diff that is > all '+' for the parent that did