Mercurial > emacs

annotate .arch-inventory @ 93445:87b6e6f4a207

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(smerge-apply-resolution-patch): New fun. (smerge-resolve): Add various resolution heuristics.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 31 Mar 2008 02:57:39 +0000
parents 7cb1d5f71446
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
56043
a0fc4f10d0cf Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-401
Miles Bader <miles@gnu.org>
parents: 56026
diff changeset
1 # Generated files
a0fc4f10d0cf Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-401
Miles Bader <miles@gnu.org>
parents: 56026
diff changeset
2 precious ^(config\.status|config\.cache)$
55782
3c8e35fb94bb Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-345
Miles Bader <miles@gnu.org>
parents:
diff changeset
3
56026
bb6720f21c54 Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-396
Miles Bader <miles@gnu.org>
parents: 55782
diff changeset
4 # Install-in-place makes these directories, so just ignore them
bb6720f21c54 Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-396
Miles Bader <miles@gnu.org>
parents: 55782
diff changeset
5 backup ^(bin|data|lock|site-lisp)$
bb6720f21c54 Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-396
Miles Bader <miles@gnu.org>
parents: 55782
diff changeset
6
55782
3c8e35fb94bb Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-345
Miles Bader <miles@gnu.org>
parents:
diff changeset
7 # arch-tag: 6eeeaa4e-cc7e-4b22-b3d7-1089e155da14