* admin/bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk".
authorGlenn Morris <rgm@gnu.org>
Tue, 10 Apr 2012 17:27:01 +0000 (13:27 -0400)
committerGlenn Morris <rgm@gnu.org>
Tue, 10 Apr 2012 17:27:01 +0000 (13:27 -0400)
commitc9279dad0b22996b74a959ede6939fe4f2c3357c
tree444eb026f65eea52acdc0d39ddcd38959292cf54
parent9f67961ce65833d876ba846a24d0fbcbe88f46a4
* admin/bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk".
Add header keyword.
admin/ChangeLog
admin/bzrmerge.el