diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-03-15 23:33:35 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-03-15 23:33:35 +0000 |
| commit | 5f3d8396896b8e8fffa113072041cb34e9167e8b (patch) | |
| tree | 0d4d65f7767f700e03c07981e6163da5a23390c5 /git-merge-file.txt | |
| parent | 92faa8075fbefc0ac3d77a3c8b6f5b5f89f6d457 (diff) | |
| download | git-htmldocs-5f3d8396896b8e8fffa113072041cb34e9167e8b.tar.gz | |
Autogenerated HTML docs for v1.7.4.1-266-ga62ea
Diffstat (limited to 'git-merge-file.txt')
| -rw-r--r-- | git-merge-file.txt | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/git-merge-file.txt b/git-merge-file.txt index f334d694e..635c66956 100644 --- a/git-merge-file.txt +++ b/git-merge-file.txt @@ -86,17 +86,6 @@ git merge-file -L a -L b -L c tmp/a123 tmp/b234 tmp/c345:: merges tmp/a123 and tmp/c345 with the base tmp/b234, but uses labels `a` and `c` instead of `tmp/a123` and `tmp/c345`. - -Author ------- -Written by Johannes Schindelin <johannes.schindelin@gmx.de> - - -Documentation --------------- -Documentation by Johannes Schindelin and the git-list <git@vger.kernel.org>, -with parts copied from the original documentation of RCS 'merge'. - GIT --- Part of the linkgit:git[1] suite |