Mercurial > hg
diff .hgignore @ 29831:1316c7cccc76
merge: remove files with extra actions from merge action list
See the comment for a detailed explanation why.
Even though this is a bug, I've sent it to 'default' rather than 'stable'
because it isn't triggered in any code paths in stock Mercurial, just with the
merge driver included. For the same reason I haven't included any tests here --
the merge driver is getting a new test.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Tue, 23 Aug 2016 17:58:53 -0700 |
parents | e63dfbbdbd07 |
children | cff0f5926797 |