Mercurial > hg
comparison tests/test-keyword @ 7527:5a14a8f3b909
resolve: require -a switch to resolve all files
Like revert -a, this should make this command slightly safer
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 19 Dec 2008 16:47:36 -0600 |
parents | e981725da3fe |
children | 6c82beaaa11a |
comparison
equal
deleted
inserted
replaced
7526:b7d4db95e95a | 7527:5a14a8f3b909 |
---|---|
320 hg commit -m 8bar | 320 hg commit -m 8bar |
321 hg merge | 321 hg merge |
322 echo % keyword stays outside conflict zone | 322 echo % keyword stays outside conflict zone |
323 cat m | 323 cat m |
324 echo % resolve to local | 324 echo % resolve to local |
325 HGMERGE=internal:local hg resolve | 325 HGMERGE=internal:local hg resolve -a |
326 hg commit -m localresolve | 326 hg commit -m localresolve |
327 cat m | 327 cat m |
328 | 328 |
329 echo % switch off expansion | 329 echo % switch off expansion |
330 echo % kwshrink with unknown file u | 330 echo % kwshrink with unknown file u |