Mercurial > hg
diff mercurial/simplemerge.py @ 9440:cd67bfcfabbe
Merge qprev/qnext backout
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 14 Sep 2009 17:29:47 -0500 |
parents | b87a50b7125c |
children | 08a0f04b56bd |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 14 Sep 2009 17:29:47 -0500 |
parents | b87a50b7125c |
children | 08a0f04b56bd |