![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Paul Mackerras <paulus@dorrigo.(none)> | |
| Wed, 20 Jul 2005 13:13:46 +0000 (09:13 -0400) | ||
| committer | Paul Mackerras <paulus@samba.org> | |
| Wed, 20 Jul 2005 13:13:46 +0000 (09:13 -0400) | ||
| commit | 3c461ffe88a7e2653663d60d9ba9f145621c9b7c | |
| tree | d9e3f047221807095bcd296983e4ce94075f40fb | tree | snapshot |
| parent | f06548617ddb79d26108a5293c918efd60774f0d | commit | diff |
Calculate the list of interesting files for a merge.
If there is a GCA for the parents of the merge, then a file is
interesting if some parent has a version that is different from both
the child and the GCA. If there is no GCA (e.g. for a merge that
pulls in an external project) then a file is interesting if the child's
version is different from all of the parents.
Next step is to actually show the differences for the interesting
files...
If there is a GCA for the parents of the merge, then a file is
interesting if some parent has a version that is different from both
the child and the GCA. If there is no GCA (e.g. for a merge that
pulls in an external project) then a file is interesting if the child's
version is different from all of the parents.
Next step is to actually show the differences for the interesting
files...
| gitk | diff | blob | history |