diff options
author | Joey Hess <joey@kitenet.net> | 2011-12-07 13:17:00 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2011-12-07 13:17:00 -0400 |
commit | d2ff311a3496fc498ad540b194767853ffdc1fc0 (patch) | |
tree | 302c0169bbfa990a89630c10707eb9f14d868699 /doc/git-union-merge.mdwn | |
parent | 5926be6f307c03f5ed1a02dffff5dce0d987e689 (diff) |
change footer
Diffstat (limited to 'doc/git-union-merge.mdwn')
-rw-r--r-- | doc/git-union-merge.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/git-union-merge.mdwn b/doc/git-union-merge.mdwn index ed1778910..8e3c34f8f 100644 --- a/doc/git-union-merge.mdwn +++ b/doc/git-union-merge.mdwn @@ -35,4 +35,4 @@ Joey Hess <joey@kitenet.net> <http://git-annex.branchable.com/> -Warning: this page is automatically made into a man page via [mdwn2man](http://git.ikiwiki.info/?p=ikiwiki;a=blob;f=mdwn2man;hb=HEAD). Edit with care +Warning: Automatically converted into a man page by mdwn2man. Edit with care |