Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5716
cmdutil: make bail_if_changed bail on uncommitted merge
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5715
bisect: remove versionstr
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5714
bisect: simplify lookup
- use repo.lookup directly
- move merge check to check_clean
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5713
bisect: remove redundant clean checks
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5712
bisect: fold in two trivial functions
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5711
bisect: remove two unused functions
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:36 -0600] rev 5710
update test-merge-types
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 22:49:01 -0600] rev 5709
ui: allow default when prompting
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 22:47:44 -0600] rev 5708
merge: add flag merging intelligence
- properly handle all 27 combinations of flags
- prompt on conflicts
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 22:47:41 -0600] rev 5707
util: remove set_exec and set_link methods