##// END OF EJS Templates
diff: don't crash when merged-in addition is copied...
diff: don't crash when merged-in addition is copied Similar to what was explained in the previous commit, the diff code expected copy source to be in "ctx1", which is not always the case during a merge. This has been broken since before hg 2.0. Also similar to the previous commit, we fix the problem by fixing up the copy dict.
Martin von Zweigbergk -
r27902:51b6ce25 default
Show More
Name Size Modified Last Commit Author
/ hgext / highlight
__init__.py Loading ...
highlight.py Loading ...