Mercurial > public > mercurial-scm > hg
log mercurial/filemerge.py @ 30073:aa23c93e636d
age | author | description |
---|---|---|
Sat, 08 Oct 2016 16:10:58 +0200 | Pulkit Goyal | py3: make format strings unicodes and not bytes |
Fri, 12 Aug 2016 05:56:40 -0700 | Simon Farnsworth | merge: always use other, not remote, in user prompts |
Fri, 12 Aug 2016 06:01:42 -0700 | Simon Farnsworth | merge: use labels in prompts to the user |