Created
October 17, 2014 22:00
-
-
Save ericwomer/f8e381ea397160d030a0 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Normal merge conflict for 'Engine/Source/Programs/UnrealBuildTool/System/UnrealBuildTool.cs': | |
| {local}: modified file | |
| {remote}: modified file | |
| Hit return to start merge resolution tool (meld): | |
| Traceback (most recent call last): | |
| File "/usr/lib/python2.7/site-packages/meld/meldapp.py", line 69, in do_command_line | |
| tab = self.parse_args(command_line) | |
| File "/usr/lib/python2.7/site-packages/meld/meldapp.py", line 278, in parse_args | |
| tab.set_merge_output_file(options.outfile) | |
| File "/usr/lib/python2.7/site-packages/meld/filediff.py", line 1036, in set_merge_output_file | |
| buf.data.set_label(filename) | |
| AttributeError: 'MeldBufferData' object has no attribute 'set_label' |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment