| commit | 7c32df5e7106bb1a208e3451aeb933371d6a34c7 | |
| author | Markus Heidelberg <markus.heidelberg@web.de> | |
| Sun, 15 Feb 2009 13:21:36 +0000 (15 14:21 +0100) | ||
| committer | Markus Heidelberg <markus.heidelberg@web.de> | |
| Sun, 15 Feb 2009 14:05:26 +0000 (15 15:05 +0100) | ||
| tree | 107dc2480c20041c01cdd8b9bf90a72fdf2e80e7 | treesnapshot (tar.gz zip) |
| parent | b1ba33a51911c21ca3ca6022593dce58a86ee620 | commitdiff |
README: move git-mergetool description to the 'master' part
Since merge conflicts can also appear there, the description to solve these
should be there, too. Also add a pointer from the custom branch to the
'master' branch description, since most of these steps are universal and
enhance the description for conflicts in normal and octopus merges.
Since merge conflicts can also appear there, the description to solve these
should be there, too. Also add a pointer from the custom branch to the
'master' branch description, since most of these steps are universal and
enhance the description for conflicts in normal and octopus merges.
| README_gitrepo.txt | diffblobblamehistory |