More explanation of conflict types
authorCraig Ringer <craig@2ndquadrant.com>
Tue, 16 Jun 2015 02:37:56 +0000 (10:37 +0800)
committerCraig Ringer <craig@2ndquadrant.com>
Tue, 16 Jun 2015 02:37:56 +0000 (10:37 +0800)
commitd4ddb1b9206028622a10f8a762c457edd2a828a6
tree6c66865ab73bc14f004249eee8fa26bab1784651
parent7345a3df162ac553ade9ddb2deae0285689539dd
More explanation of conflict types
doc/manual-conflicts.sgml