1 |
I thought I'd share this with the gentoo-scm list just in case someone |
2 |
is interested. It was rejected by the git list due to mergetool |
3 |
needing refactoring. basically I have to clean up temporary files I |
4 |
shouldn't have to clean up and that was going to require me to |
5 |
refactor more of mergetool than I understood. I created the patch to |
6 |
skip merging manifests or abort out when there were nothing left but |
7 |
manifests to merge. but it'll work for anything. the patch doesn't |
8 |
break any current functionality. (this version only works for 1.6.2*) |
9 |
|
10 |
-- |
11 |
Caleb Cushing |
12 |
|
13 |
http://xenoterracide.blogspot.com |