![]() ![]() $ diffuse -r HEAD^1 -r HEAD^2 -r HEAD^3 -r HEAD^4 -r HEAD^5 foo.C ![]() The inputs to a Git octopus merge could be viewed ![]() For example, this will display a 2-wayĭiffuse does not limit the number of panes that can be used forĬomparing files. $ diffuse -r MERGE_HEAD foo.C foo.C -r HEAD foo.Cįor the -c option may be used to easily specifyĪ pair of sequential revisions. Local files can be mixed with files from the version control system.įor example, this will display a 3-way merge between revision For example, this will display aĢ-way merge between revision 123 of foo.C and Multiple file revisions can be compared by specifying multiple This will display a 2-way merge between revision 123 of The local file will be usedįor comparison if only one file revision is specified. Any revision specifier understoodīy the version control system may be used. The -r option may also be used to explicitly ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |