Mercurial > hg > mercurial-crew-with-dirclash

annotate templates/raw/filediff.tmpl @ 5483:0c43f87baba3 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 27 Oct 2007 16:27:55 +0400
parents a63be0dfa42e
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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