Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix AttributeError on merge conflict #70

Merged
merged 1 commit into from
Jun 18, 2012
Merged

Fix AttributeError on merge conflict #70

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion legit/cli.py
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ def display_version():


def handle_abort(aborted): def handle_abort(aborted):
print colored.red('Error:'), aborted.message print colored.red('Error:'), aborted.message
print black(aborted.log) print black(str(aborted.log))
print 'Unfortunately, there was a merge conflict. It has to be merged manually.' print 'Unfortunately, there was a merge conflict. It has to be merged manually.'
sys.exit(1) sys.exit(1)


Expand Down