[egit-dev] Merge Tool does not work for conflicts while cherry-picking

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]

[egit-dev] Merge Tool does not work for conflicts while cherry-picking

From: Silvio Heuberger <kung.foo@xxxxxxx>
Date: Thu, 31 Mar 2011 14:19:28 +0200
Delivered-to: egit-dev@xxxxxxxxxxx
List-archive: <https://dev.eclipse.org/mailman/private/egit-dev>
List-help: <mailto:egit-dev-request@eclipse.org?subject=help>
List-subscribe: <https://dev.eclipse.org/mailman/listinfo/egit-dev>, <mailto:egit-dev-request@eclipse.org?subject=subscribe>
List-unsubscribe: <https://dev.eclipse.org/mailman/options/egit-dev>, <mailto:egit-dev-request@eclipse.org?subject=unsubscribe>

Contrary to what is said here:

http://wiki.eclipse.org/EGit/New_and_Noteworthy/0.10#Merge_Tool

I found that in the nightly build version, the "Merge Tool" Menu entry is disabled, when I select a file that has conflicts while I cherry-pick.

Cheers
Silvio

Follow-Ups:
- Re: [egit-dev] Merge Tool does not work for conflicts while cherry-picking
  - From: Robin Stocker

Prev by Date: Re: [egit-dev] updates-nightly: osgi.bundle, org.eclipse.egit.doc download problem
Next by Date: [egit-dev] Eclipse 3.4 fork
Previous by thread: [egit-dev] Enable UI tests for Hudson CI
Next by thread: Re: [egit-dev] Merge Tool does not work for conflicts while cherry-picking
Index(es):
- Date
- Thread

Breadcrumbs