##// END OF EJS Templates
merge: more safe detection of criss cross merge conflict between dm and r...
merge: more safe detection of criss cross merge conflict between dm and r 41f6af50c0d8 introduced handling of a crash in this case. A review comment suggested that it was not entirely obvious that a 'dm' always would have a 'r' for the source file. To mitigate that risk, make the code more conservative and make less assumptions.
Mads Kiilerich -
r30859:086c3765 stable
Show More
Name Size Modified Last Commit Author
/ contrib / docker
apache-server
centos5 Loading ...
centos6 Loading ...
centos7 Loading ...
debian-jessie Loading ...
fedora20 Loading ...
fedora21 Loading ...
ubuntu.template Loading ...