index d8df55362ce653516006b02df2950c325f1176b7..63ededec1d7099bb2156461895f32dcf008dedcc 100644 (file)
'$MERGED', '$LOCAL', '$REMOTE', and '$BASE' must be defined
for use by the merge tool.
-Author
-------
-Written by David Aguilar <davvid@gmail.com>
-
-Documentation
---------------
-Documentation by David Aguilar and the git-list <git@vger.kernel.org>.
-
GIT
---
Part of the linkgit:git[1] suite