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

Merge UI bug fixes and links #425

Merged
merged 3 commits into from
Jun 25, 2015
Merged

Merge UI bug fixes and links #425

merged 3 commits into from
Jun 25, 2015

Commits on Jun 25, 2015

  1. Merge UI: Add hyperlink to objects, show path in mine, if it is not i… 

    …dentical with theirs
    Zsolt Lattmann committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    902daad View commit details
    Browse the repository at this point in the history

  2. Merge UI: parse node path from conflict object. Fix hyperlinks.

    Zsolt Lattmann committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    66775f9 View commit details
    Browse the repository at this point in the history

  3. Merge UI: add examples for regex that we parse.

    Zsolt Lattmann committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    fcc0ffa View commit details
    Browse the repository at this point in the history