Mercurial > public > mercurial-scm > hg
log mercurial/merge.py @ 23649:18ab5e5955df
age | author | description |
---|---|---|
Wed, 19 Nov 2014 11:44:00 -0800 | Martin von Zweigbergk | merge: structure 'remote created' code to match table |
Thu, 11 Dec 2014 22:07:41 -0800 | Martin von Zweigbergk | merge: make calculateupdates() return file->action dict |