From: Glenn Morris <rgm@gnu.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: some bzrmerge.el questions
Date: Fri, 14 Jan 2011 14:00:04 -0500 [thread overview]
Message-ID: <hr1v4fgvkb.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <r2r5cfcrdk.fsf@fencepost.gnu.org> (Glenn Morris's message of "Fri\, 14 Jan 2011 12\:44\:07 -0500")
>>> Actually, it looks like there is a workaround.
>>
>> Which is?...
Or indeed just use rm + bzr resolve, as pointed out on the Bazaar
mailing list. Wish I'd known about that yesterday. :(
next prev parent reply other threads:[~2011-01-14 19:00 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-13 20:29 some bzrmerge.el questions Glenn Morris
2011-01-13 21:43 ` Stefan Monnier
2011-01-14 7:12 ` Glenn Morris
2011-01-14 8:19 ` Glenn Morris
2011-01-14 17:30 ` Eli Zaretskii
2011-01-14 17:44 ` Glenn Morris
2011-01-14 19:00 ` Glenn Morris [this message]
2011-01-14 17:48 ` Glenn Morris
2011-01-14 18:39 ` Stefan Monnier
2011-01-15 20:44 ` Glenn Morris
2011-01-16 4:30 ` Stefan Monnier
2011-01-17 17:58 ` martin rudalics
2011-01-17 19:29 ` Stefan Monnier
2011-01-18 3:04 ` Glenn Morris
2011-01-18 15:12 ` Stefan Monnier
2011-01-18 18:30 ` Glenn Morris
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=hr1v4fgvkb.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).