Mercurial > hg
log mercurial/merge.py @ 27006:9d58dc193c46
age | author | description |
---|---|---|
Tue, 17 Nov 2015 14:23:26 -0800 | Siddharth Agarwal | mergestate.commit: factor out making the list of records |
Tue, 17 Nov 2015 14:04:56 -0800 | Siddharth Agarwal | mergestate: move _read() call to read constructor |
Tue, 17 Nov 2015 13:55:30 -0800 | Siddharth Agarwal | mergestate: add a constructor that reads state from disk |
Tue, 17 Nov 2015 17:04:53 -0800 | Siddharth Agarwal | merge.applyupdates: switch to mergestate.clean() |
Tue, 17 Nov 2015 17:00:54 -0800 | Siddharth Agarwal | mergestate: add a constructor that sets up a clean merge state |
Tue, 17 Nov 2015 14:11:52 -0800 | Siddharth Agarwal | mergestate: raise structured exception for unsupported merge records |
Sun, 15 Nov 2015 22:45:20 -0800 | Siddharth Agarwal | merge.applyupdates: don't return early if merge driver's conclude failed |