Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/filediff-raw.tmpl @ 1674:dee55c4a4963
abort when using 'update -m' and this is not a merge
add more testcases for updating with local changes
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 01 Feb 2006 08:46:24 +0100 |
parents | f918a6fa2572 |
children |
rev | line source |
---|---|
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
diff
changeset
|
1 #header# |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
diff
changeset
|
2 #diff# |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
diff
changeset
|
3 #footer# |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
diff
changeset
|
4 |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
diff
changeset
|
5 |