Mercurial > public > mercurial-scm > hg
log mercurial/merge.py @ 28088:19424f960bf5
age | author | description |
---|---|---|
Thu, 11 Feb 2016 17:23:10 -0800 | Durham Goode | checkunknown: audit path before checking if it's a file or link |
Wed, 03 Feb 2016 13:12:06 -0800 | Siddharth Agarwal | rebase: respect checkunknown and checkignored in more cases |
Mon, 01 Feb 2016 20:28:32 -0800 | Siddharth Agarwal | merge: tell _checkunknownfiles about whether this was merge --force |
Mon, 01 Feb 2016 20:28:32 -0800 | Siddharth Agarwal | merge: add missing doc for 'labels' parameter |