Make it easier to control which revisions bzrmerge might skip.
authorGlenn Morris <rgm@gnu.org>
Tue, 25 Jan 2011 05:10:02 +0000 (21:10 -0800)
committerGlenn Morris <rgm@gnu.org>
Tue, 25 Jan 2011 05:10:02 +0000 (21:10 -0800)
commitd0cb866238b3a7ab811ed666d21e8bd97f6f3b41
tree9c14b4b9fb55fdc1f3d355aa7bdd07b30937805a
parent73b0cd50031a714347109169ceb8bacae338612a
Make it easier to control which revisions bzrmerge might skip.

* admin/bzrmerge.el (bzrmerge-skip-regexp): New variable.
(bzrmerge-missing): Use it.
admin/ChangeLog
admin/bzrmerge.el