This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
Summary: | Merge Conflicts Resolver should display Branch assignment | ||
---|---|---|---|
Product: | versioncontrol | Reporter: | ulfzibis <ulfzibis> |
Component: | Mercurial | Assignee: | Ondrej Vrabec <ovrabec> |
Status: | VERIFIED FIXED | ||
Severity: | normal | ||
Priority: | P3 | ||
Version: | 8.0 | ||
Hardware: | PC | ||
OS: | All | ||
See Also: |
https://netbeans.org/bugzilla/show_bug.cgi?id=245574 https://netbeans.org/bugzilla/show_bug.cgi?id=245575 https://netbeans.org/bugzilla/show_bug.cgi?id=245172 https://netbeans.org/bugzilla/show_bug.cgi?id=246204 |
||
Issue Type: | DEFECT | Exception Reporter: |
Description
ulfzibis
2014-06-24 12:38:53 UTC
makes sense, for git too... fix: core-main #950f14556e98 Integrated into 'main-silver', will be available in build *201406270001* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress) Changeset: http://hg.netbeans.org/main-silver/rev/950f14556e98 User: Ondrej Vrabec <ovrabec@netbeans.org> Log: #245218 - Merge Conflicts Resolver should display Branch assignment Will this fix be available as patch for 8.0 ? (In reply to ulfzibis from comment #3) > Will this fix be available as patch for 8.0 ? I doubt it. I can mark it as candidate though in case there is a patch coming. (In reply to Ondrej Vrabec from comment #4) > I can mark it as candidate though in case there is a patch coming. Much thanks :-) Really great! |