Mercurial > hg
diff mercurial/merge.py @ 23400:3bd577a3283e stable
merge: be precise about what merged into what in short desc
author | anatoly techtonik <techtonik@gmail.com> |
---|---|
date | Wed, 26 Nov 2014 17:22:09 +0300 |
parents | ff93aa006e6a |
children | 3177d710630d 902554884335 |