equal
deleted
inserted
replaced
67 $ hg --config extensions.n=$TESTTMP/noexec.py commit -m 'win: merge' |
67 $ hg --config extensions.n=$TESTTMP/noexec.py commit -m 'win: merge' |
68 |
68 |
69 $ hg manifest -v |
69 $ hg manifest -v |
70 755 * a |
70 755 * a |
71 644 b |
71 644 b |
|
72 |
|
73 $ cd .. |