>>>>> "vila" == Vincent Ladeuil <[EMAIL PROTECTED]> writes:
<snip/>
vila> Which didn't work until I apply the attached patch (crude,
vila> certainly not related to our discussion, just useful as an
vila> example :).
<cough>, <blush>, May be a non-empty bundle will be more useful <hiding under a
rock>
Vincent
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# target_branch: http://bzr.xsteve.at/dvc/
# testament_sha1: 6c34de8742a83fe118dfa2c89ca028de41307cea
# timestamp: 2008-10-16 08:04:48 +0200
# base_revision_id: [EMAIL PROTECTED]
#
# Begin patch
=== modified file 'lisp/xmtn-conflicts.el'
--- lisp/xmtn-conflicts.el 2008-09-28 19:32:07 +0000
+++ lisp/xmtn-conflicts.el 2008-10-16 06:04:23 +0000
@@ -471,8 +471,8 @@
nil
nil))
-(dvc-make-ewoc-next xmtn-conflicts-next xmtn-conflicts-ewoc)
-(dvc-make-ewoc-prev xmtn-conflicts-prev xmtn-conflicts-ewoc)
+;(dvc-make-ewoc-next xmtn-conflicts-next xmtn-conflicts-ewoc)
+;(dvc-make-ewoc-prev xmtn-conflicts-prev xmtn-conflicts-ewoc)
(defun xmtn-conflicts-resolvedp (elem)
"Return non-nil if ELEM contains a conflict resolution."
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVmZIsUAAZ1fgAAQUfv//9oE
EQC//9/wUAPZbXpLXbtKDWwkkkxNJ6ZqmyZE3qNR6aCAABpoJKTI9RknpMmk9QZGmg0AAAAlNImi
NMozUwaRpkxDRoaZGg0GAAAAA0AAAAACSRMjRNT0yYTKj09TJPSbUNAGmmnpdrstLvDkYMVyiXZQ
0hNMpTRpjMBki+LJRlt958BtzIS47yyMhXoq9BLdL05Y4HOmE0V8Vyoftg8vpzggpRPcP2Uamfg/
NW1kWOptPah0VcSRmhZOO0E2qhK4/HDsqyCzyFkaVFYitCDviiiJtbQ1CqByWSV52ot1U4X1DdNL
1faiyBo5YViGjpG3Ujch4DUJNgckrCILSO1MPcRfsLTb3XlrUJ8as0k5wuVmUyZtnHDCs8bm8yI5
hfKpWGu211A4pDQhbqUYDYITUQsJMK1ruMhWZDrE2iwMTXU8dIWjOVkoZD5KlVpjLLMQLImcV77i
h7jfNhWYscQwpingXD7N1RcsC/RYcVJT13uFITVjMMGhTOTkw4uTFRMXwpkQI7YTHvxB5ClEhjYX
dotldjKQJqHD1wE7JPNpWQa+gxJ0jfygbhXx3nTjAruJjzYQwdUQ0qKfMgPfB9OsSatDbUa65hYq
nWE0Igs282Z4TOSTw7qWT6VbQDj1cUzabJkOs6YSdQGYwNcpwNUvbhStMQ61vtm6R8WtS30C739G
CYw2GjdjJS5ZI4BacUyvNpfNUDvERJUkj9xmWpTNtYiKAGchXmHZ2tKCEkRKybAqsegvPct3Q2/k
5vO4u7U7FbUnSShoer51qhttuORvy7CumMI3Q8DBKDSq8wCSeOxMiSx7t0A4lCiBORTAd6L09Wxv
sPmOTBgVHlz41IGV6Xmlp3i/e+sbEMY7rRXrkrFN4GRbwA9UQNCIGWVhsRn5XhPw0ujqAuAoNcTv
G0q6leqw2amSYmW52qU2jBkBztqM+70SfdxY1QXKYw/GfYPuIchx1Ag6bUTuTD0wWkHwLXhCtMA5
2WQnshlhOpheXVF3MUDX/6qkDo4CdEQoqXg9WQu7DHNJ5nnmvEiSDBxsyyJSGq37UpG8TVBrMlxi
LYU/C3YyfTPSF7qAlAgwyrfEDxUHDNeXqRmA0yy6CmJ21TtoZMbGcvaecLYOxFluvwIxOmpncOhN
hJ1ZnHHABihRCQagMRZbnGPXUxA4V0s89OBmmkLEp0wEzIpgwSyjcVnJEwMvQTPsbAc560VkuJ/i
7kinChILMyRYoA==
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
