fallback to unexpanded diff mode on "osc diff" on merge error. Same behaviour as...
authorAdrian Schröter <adrian@suse.de>
Wed, 12 Jan 2011 16:09:41 +0000 (17:09 +0100)
committerAdrian Schröter <adrian@suse.de>
Wed, 12 Jan 2011 16:09:41 +0000 (17:09 +0100)
commit8fed7847e4e1bd9686e8d46641062aa5021207ff
tree4a15773e91ef2724426410fce2d677e467074ba8
parentd11e9f851451de76117023c8e99f05a513741611
fallback to unexpanded diff mode on "osc diff" on merge error. Same behaviour as rdiff is doing.
NEWS
osc/commandline.py