Mercurial > hg
log tests/failfilemerge.py @ 43044:f9d35f01b8b3
age | author | description |
---|---|---|
Mon, 11 Sep 2017 13:03:27 -0700 | Phil Cohen | merge: pass wctx to premerge, filemerge |
Mon, 17 Oct 2016 23:16:55 +0200 | Mads Kiilerich | spelling: fixes of non-dictionary words |
Fri, 12 Aug 2016 06:01:42 -0700 | Simon Farnsworth | merge: use labels in prompts to the user |
Sun, 03 Apr 2016 19:41:00 +0900 | Yuya Nishihara | tests: sort import lines in failfilemerge.py |
Fri, 05 Feb 2016 01:56:46 +0000 | timeless | rebase: update working directory when aborting (issue5084) stable |