# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: john@arbash-meinel.com-20081007205901-ifjebw6gzul1awyn
# target_branch: http://bzr.arbash-meinel.com/plugins/DEACTIVATED/gtk-\
#   trunk
# testament_sha1: 9721a8872319ee343509a22214e5f45ad2ce75f6
# timestamp: 2008-10-07 15:59:39 -0500
# source_branch: http://bzr.arbash-meinel.com/plugins/gtk
# base_revision_id: jelmer@samba.org-20080903194613-kkq5m5kilx4rnax5
# 
# Begin patch
=== modified file 'diff.py'
--- diff.py	2008-07-25 13:32:06 +0000
+++ diff.py	2008-10-07 20:59:01 +0000
@@ -689,7 +689,7 @@
                     change_type = kind_changed
                     display_path = (paths[0] + source_marker
                                     + ' => ' + paths[1] + marker)
-                elif changed_content is True or executables[0] != executables[1]:
+                elif changed_content or executables[0] != executables[1]:
                     change_type = modified
                 else:
                     assert False, "How did we get here?"

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeNm0e8AAdVfgCAUce///3/3
/3q////wUASekAEQAAA1NNTTIBQ2kemoGINMTaQ9QD1NGjTNI09R6mg4aaYIZDTTIyYQDTQBhNGm
TAAgaHDTTBDIaaZGTCAaaAMJo0yYAEDQ4aaYIZDTTIyYQDTQBhNGmTAAgaCUQBE000GQNITGgRgS
eKbRomJtEaHoTAJnx47bzT9fqmmGRfbV1TRwqNW1sNLsRyLEQ2RVhTW6yEowG6Kcyl2hl2CBE7nR
pqUtkqUmDJcs1JdwPwRUHqdLgbq6VN6o9epLDSpmI3iDUiQohytXbHBJbnIQXUxkW7ZQhMuZoGum
5Uh2e/6P9IgeCbUusOHSFQHaVWgdoZ0DWvJa8jQIXhsoLTIxVrZ3IUPEVaGXcQ0BUE1AYRpeNDN6
JEQIK+A4CXIMQStomMl0facC45vZKxJxYFFIHnBzgOA9vK7K4x3FoTdIkaSyogfcYeHBPdiEmKXb
gFJRSSJZShETEA3NLCapkMkSiJJDVJSR/rgmLQEp4BziZkVpao1hQRK5MMsRirXfgM48zGcaTDMj
MgxwzWc/I78g7WzC1c1piYlZdcwmQAtLRSlKX6OEPMPtPQtxQFUx0zUipaKp+QPVQURLBjEQrJBr
GEBtxEghmGMAcay+OIkPLElrnek5kKgHhLBkSRopCQ8WJ5d3LzRpgMy0mBUUwA+kwIP7D4dB1qJ7
FPfdh42MkczSwyKS4videE1pCyMzQAwDi0UZ/u/P3qCXKalYsENggCQXqFDDQ9S1B9ZS2dD5qdFp
/qyOeeaKEfKDRHJFzJRw2Be/HH7n7PDAGw86GiimtmjWxGNw4rgcS8sCy/HtLCqKwqvAtjL1bf9K
NvHML9pCoK/v4Ok/bN8QeheeBZWRkdnr9pXkUKx6D+TB5PDGUFclOw/CBQJkyCHb8klRnAUOqGg5
8HeTCYh6L5e4WJ/HToAiFaeJhNDDdJ+RUc7zLfckWVer6fJAh+h6Wb5Mpxjf5KknELpjiGFBplHn
zO2rMXbp0Md47dehNjJkBW8u8XmVu8fA0Zl4y2p6HHecx+4DfIrxkTFZ7sSBjEPxSGIdzpESqzLC
AXfrWG6WjyC0IG+NBr9GjTzGc0jRvCWECSH321NAzsDkIDTEH52IjTsl+vt28wGrOqBaqqgxhhVn
EIOsRq1lXTzg812oOAllTpCBb90aheIVM+ulsJiH98KBvNr8MIHRcnn1JS5GV69Jlt5797hDUhHF
qDt66gdr2KgWvAuDPu76cRHERGBh4KB8Q35oGMGI4SxAWAZ96Rh86I7DLyZwl6oRcjmKMYDkC6po
bhqsCc0HqCWNF7rUeKj1E+jE3/nPu60DUiEBDrYPQr4EKgoDJ1OSu6y3TRfffrB5MKdyEBa0wB3x
06VVE3moLh2PQKauFolXpI4VRtAUxYG0MzbAe9RVPi9qX31d8YC9SjOM8QyaJIgpkrMbMCbiiOoC
kmpISfLJTBt4nmImPGECjCkSDI46BpRQhMGqOUMMWjdvM2nZq2gcJgxVZ9pRFxUmZA3QMdJYBWCg
80KFFWtGM8Wev0esDS6g06SmsBv/i7kinChIcbNo94A=