Mercurial > hg
log mercurial/merge.py @ 28009:4a25e91fa55d
age | author | description |
---|---|---|
Fri, 05 Feb 2016 10:15:28 -0800 | Durham Goode | merge: add state extras merge state data |
Fri, 29 Jan 2016 14:19:29 -0800 | Siddharth Agarwal | merge: don't try to merge subrepos twice (issue4988) stable |
Fri, 15 Jan 2016 13:14:49 -0800 | Bryan O'Sullivan | with: use context manager in merge update |
Tue, 12 Jan 2016 18:38:49 -0800 | Siddharth Agarwal | merge: split up checks for unknown and ignored files that differ |
Tue, 12 Jan 2016 18:17:07 -0800 | Siddharth Agarwal | merge: determine what untracked conflicts cause warns and aborts separately |
Tue, 12 Jan 2016 18:12:35 -0800 | Siddharth Agarwal | merge: factor out code to get checkunknown config |
Sat, 02 Jan 2016 03:11:52 -0800 | Siddharth Agarwal | merge: add options to warn or ignore on colliding unknown files |