Mercurial > hg
comparison hgext/shelve.py @ 22905:63e889cc610d
rebase: move duplicatecopies next to merge
This is preparation for removing open-coded rebase/graft operations.
As a side-effect, this exposes proper renames in the working copy when
there are conflicts, which shows up in test-shelve.t.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 13 Oct 2014 17:55:45 -0500 |
parents | 43816070284e |
children | ebef5fcf7bd0 |
comparison
equal
deleted
inserted
replaced
22904:baa3cfa03a83 | 22905:63e889cc610d |
---|