diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-15 13:25:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-15 13:27:04 -0700 |
| commit | ed44fd045a8a4bcf7f30a47e4fc6aba761faaf78 (patch) | |
| tree | ccc8afe7eb85ec89347047f8e3fb5ff7f4c2f6a6 /Documentation/git-mergetool--lib.txt | |
| parent | e0d48279d5a96bc02edac72c1d28fc38aed37c15 (diff) | |
| parent | 4d8b32a2e1758236c4c1b714f179892e3bce982c (diff) | |
| download | git-ed44fd045a8a4bcf7f30a47e4fc6aba761faaf78.tar.xz | |
Merge v1.7.5-rc2 into jn/format-patch-doc
This is to sync with the recent updates in Documentation/SubmittingPatches
and Documentation/format-patch.txt
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
| -rw-r--r-- | Documentation/git-mergetool--lib.txt | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Documentation/git-mergetool--lib.txt b/Documentation/git-mergetool--lib.txt index d8df55362c..63ededec1d 100644 --- a/Documentation/git-mergetool--lib.txt +++ b/Documentation/git-mergetool--lib.txt @@ -41,14 +41,6 @@ run_merge_tool:: '$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 |