Mercurial > hg
diff hgmerge @ 3120:1c1e59aac82a
merge: simplify local created logic
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 17 Sep 2006 21:11:26 -0500 |
parents | 6a03cff2b0f5 |
children | e4480f2b61e9 |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 17 Sep 2006 21:11:26 -0500 |
parents | 6a03cff2b0f5 |
children | e4480f2b61e9 |