Hacker News
new
|
past
|
comments
|
ask
|
show
|
jobs
|
submit
login
j_s
on Dec 27, 2010
|
parent
|
context
|
favorite
| on:
Meld - a great visual diff and merge tool for linu...
I believe the cross-platform (so semi-native) PlasticSCM's included xmerge has what you're looking for:
http://codicesoftware.blogspot.com/2010/07/xmerge-to-merge-r...
qaexl
on Dec 27, 2010
[–]
Xmerge looks great. Too bad I'm on git.
psantosl
on Dec 28, 2010
|
parent
[–]
You can always switch to Plastic!! Now it is FREE, didn't you know. Or, as last resort: why don't you use Xmerge with Git?? :)
Guidelines
|
FAQ
|
Lists
|
API
|
Security
|
Legal
|
Apply to YC
|
Contact
Search:
http://codicesoftware.blogspot.com/2010/07/xmerge-to-merge-r...