Mercurial > hg
diff contrib/simplemerge @ 8736:7619b16ea880
merge: fix prompt keep
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 08 Jun 2009 18:14:44 -0500 |
parents | bb9f13974d8e |
children | 659f34b833b9 |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 08 Jun 2009 18:14:44 -0500 |
parents | bb9f13974d8e |
children | 659f34b833b9 |