mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-30 09:01:24 +02:00
Code
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
44 Commits 6 Branches 954 Tags 460 MiB
C 50.3%
Shell 38.6%
Perl 5.2%
Tcl 3.3%
Python 0.8%
Other 1.6%
3c461ffe88
Go to file
Paul Mackerras 3c461ffe88 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...
2005-07-20 09:13:46 -04:00
gitk Calculate the list of interesting files for a merge. 2005-07-20 09:13:46 -04:00