diff options
Diffstat (limited to 'Documentation/git-resolve-script.txt')
| -rw-r--r-- | Documentation/git-resolve-script.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-resolve-script.txt b/Documentation/git-resolve-script.txt index 8dd84a381..99c399a07 100644 --- a/Documentation/git-resolve-script.txt +++ b/Documentation/git-resolve-script.txt @@ -1,6 +1,6 @@ git-resolve-script(1) ===================== -v0.1, May 2005 +v0.99.4, Aug 2005 NAME ---- @@ -18,7 +18,8 @@ This script is used by Linus to merge two trees. Author ------ -Written by Linus Torvalds <torvalds@osdl.org> +Written by Linus Torvalds <torvalds@osdl.org> and +Dan Holmsand <holmsand@gmail.com>. Documentation -------------- |