Flesh out the conflicts docs
authorCraig Ringer <craig@2ndquadrant.com>
Fri, 19 Jun 2015 09:10:11 +0000 (17:10 +0800)
committerCraig Ringer <craig@2ndquadrant.com>
Fri, 19 Jun 2015 09:10:11 +0000 (17:10 +0800)
commit6680c184ffab6c70136bcbefdfafbe15f79f5c11
tree6e8e2040f66d1c42c5dd513a1b9d1e564615e90d
parentc4a9a0978c20eb5b5a50a148359a6a235736c3db
Flesh out the conflicts docs
doc/manual-conflicts.sgml