Mercurial > hg
diff mercurial/node.py @ 7847:30cb79d84352
resolve: keep .orig files
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 16 Mar 2009 16:58:41 -0500 |
parents | e45fc5d03798 |
children | 46293a0c7e9f |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 16 Mar 2009 16:58:41 -0500 |
parents | e45fc5d03798 |
children | 46293a0c7e9f |