Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge8 @ 4875:97dbf330069a
Re: mercurial.el and hg-version-other-window
hg-version-other window is unimplemented in mercurial.el. The version
below works for me, YMMV.
author | jon.christopher@Rigaku.com |
---|---|
date | Sat, 14 Jul 2007 11:27:58 -0500 |
parents | efbe24c7d8d9 |
children |
line wrap: on
line source
#!/bin/sh # Test for changeset ba7c74081861 # (update dirstate correctly for non-branchmerge updates) hg init a cd a echo a > a hg add a hg commit -m a cd .. hg clone a b cd a hg mv a b hg commit -m move echo b >> b hg commit -m b cd ../b hg pull ../a hg update