projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed type of name argument to m_getfld() from unsigned char *
[mmh]
/
man
/
conflict.man
diff --git
a/man/conflict.man
b/man/conflict.man
index
1af15e3
..
3f2dc08
100644
(file)
--- a/
man/conflict.man
+++ b/
man/conflict.man
@@
-1,4
+1,4
@@
-.TH CONFLICT %manext8% "%nmhdate%" MH.6.8 [%nmhversion%]
+.TH CONFLICT %manext8% "June 24, 2012" "%nmhversion%"
.\"
.\" %nmhwarning%
.\"
.\"
.\" %nmhwarning%
.\"