log mercurial/merge.py @ 31646:e960eba3581c

age author description
Sun, 26 Mar 2017 16:55:56 -0700 Jun Wu merge: use ProgrammingError