Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 3731:b4af5f92e04b
age | author | description |
---|---|---|
Thu, 30 Nov 2006 17:36:33 -0600 | Matt Mackall | merge: move check for empty ancestor into findcopies |
Thu, 30 Nov 2006 17:36:33 -0600 | Matt Mackall | merge: only store one direction of copies in the copy map |
Thu, 30 Nov 2006 17:36:33 -0600 | Matt Mackall | merge: add copied hash to simplify copy logic |