Mercurial > hg
comparison mercurial/merge.py @ 27651:07fc2f2134ba
origpath: move from cmdutil to scmutil
This is a lower-level function so it doesn't need to be in cmdutil, and putting
it here avoids a bunch of potential import cycle issues.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Sat, 02 Jan 2016 03:02:57 -0800 |
parents | b8405d739149 |
children | cc91f3bc5461 |
comparison
equal
deleted
inserted
replaced
27650:e7222d326ea2 | 27651:07fc2f2134ba |
---|