OSDN Git Service

incorporates patch #408224
authorgrimmd <none@none>
Tue, 13 Mar 2001 20:20:28 +0000 (20:20 +0000)
committergrimmd <none@none>
Tue, 13 Mar 2001 20:20:28 +0000 (20:20 +0000)
commit340bb824c18da40b4c2f1ee0fadb1a75b866c94f
tree14a963edf8ca88120e7095839d397eb15815a0a4
parent23fac61f8c453705d2dc8f29165400ddc5405c77
incorporates patch #408224
Src/MergeDoc.h