# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: benjamin@neron-20080607170144-rmm5e7johodhr9if
# target_branch: bzr+ssh://benji2@bazaar.launchpad.net/%7Ejavierder\
#   /bzr-gedit/main/
# testament_sha1: 9647705e6948693bc32a5c67da880e39fea44754
# timestamp: 2008-06-07 19:02:39 +0200
# base_revision_id: javierder@gmail.com-20080530234851-\
#   5xgcd27bpp3t4y9c
# 
# Begin patch
=== modified file 'plugins/bzr/__init__.py'
--- plugins/bzr/__init__.py	2008-05-30 13:30:18 +0000
+++ plugins/bzr/__init__.py	2008-06-07 17:01:44 +0000
@@ -479,7 +479,7 @@
                 if delta.has_changed():
                     dialogs._bzrInfoDialog("Status",delta.get_changes_as_text(),[250,300])
                 else:
-                    dialogs._bzrErrorDialog("This branch has no changes")
+                    dialogs._bzrInfoDialog("Status", "This branch has no changes")
             except:
                 dialogs._bzrErrorDialog("Bazaar error showing status." ,sys.exc_value)            
     

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWcEgqoAAXF/gABQQABRZ///
ViAMAL////BQA3u7vPVK0DE7hJU0E9QZAMhoBoGgBoABojVDYRB6TT1AAAAAABJTITU9KnlPMjU0
/UpoGCZqMTTNBpBqnqeUNTRoGmgYTRoaGIGTTE0Ekpk0TNAgNNAFNhJp6T1BpiPUfDTasP7q7CTH
nJMQVYVpF4gcrlX5I5Z0omHpTUdm0iIU+APqMxLjEZmdWpT3n8iIXqrIz7pIwbSrEAiIBeWGq5Bp
9Vsgc8o2glpXXmvKICyqg7DTNwcPsKwiA0FZTzZJxYLTKvkO7SwVYcMfFD4oqzJRJ3XwFaTFucTy
diJBGc5inKEKJkJ+BAccZTVUrAo51OTypWJ8dc8tm+PdzDiQTxk0hkF2fTf5DTKYlWu6xUWoUDVl
xzKZitEkYczy0NtGTJmmUTFykY6yZs8PQjefK1CjOMMLGY1FXmIKykxnBY7ScpM6u2GTMrgmt13O
LlUcZikZzPXYWJmpZizMJxXchg5aacyX1LxeVxriQuKUK2LErKWJOz8CoyZJyU4qkiWG4XyPg2KD
kxan4iwIbDsujC9WONMpWVs7plHMsP8Y9LyYnB3oEUmL4EDhLvexdEbfofoqPVpMDX7Zam6jjQMT
GwPGBnf1ORExh0D0C04AWyla5xExqfVakE0JHtsExzxj6cdUrpmeZLiCTKSl03p4n0mFShJvB2c6
Ed6oMS0vVQ6hE5TsDiKP73ENpL2Kx5Z1H+TrD0FvOWOJePpbNS8PQ5ZXVcSTzJH5+U6TvCZG66qQ
NQdciWAVjzKsQE6kcZWDWXlxgaAeSn325rbVIHjz3HDsqRTd2PgIfG4laIMo0+JhahSWBfpf/Wkr
+qNwQLxQMYXp5XrA9wqo98HQygcqwKrKaoc5SUDN2Y7gXloY9wTUKQ3tm9WV5ss1owF0BJeJceFr
xwLpio+J1TIgoJQCxIcH/KTcSK53uA4UYHgiC7Tm27WPsL57FrE25Ga90mSqwqhmXaywZa6GWWSi
TCe9W3FKELvFYHdp6rVOC80CZEjgrHB7cJhV88trJ00MhQtgs+iCUIBf/Hk7DJsNNjpPM4+r6hm5
G2ZisoAaVQXtdBEZu5PvoEy8RMPx7FzWwyegLETkAaCQyc8ooFOG5kjyYoAuAScJnJ4qFAmlOJyu
mdk6zTDTIBtGlH8XckU4UJBnBIKq