log tests/test-merge-tools.out @ 9822:8b3e0435e690

age author description
Thu, 17 Sep 2009 22:39:38 -0700 Stuart W Marks hg: say 'hg update' instead of 'hg up' in merge status message
Sun, 21 Jun 2009 03:13:38 +0200 Mads Kiilerich ui.prompt: Show prompt and selection in non-interactive mode
Sun, 21 Jun 2009 03:11:52 +0200 Mads Kiilerich test merge-tools internal:dump and internal:prompt
Thu, 21 May 2009 22:43:38 +0200 Patrick Mezard test-merge-tools: windows fixes
Thu, 19 Mar 2009 10:25:13 -0700 Lee Cantey Fix for merge changes introduced in rev 9fe7e6acf525
Mon, 09 Mar 2009 18:44:44 +0100 Mads Kiilerich test-merge-tools: test ui.merge functionality and selection of internal tools
Wed, 04 Mar 2009 13:06:16 -0600 Augie Fackler merge: better error messages to lead users to hg update --clean to abandon merges.
Tue, 10 Feb 2009 16:11:48 +0100 Mads Kiilerich test-merge-tools: Don't use tac
Sun, 25 Jan 2009 21:20:13 +0100 Mads Kiilerich Make util.find_exe alway returns existing file, fixing issue1459
Sun, 25 Jan 2009 21:20:11 +0100 Mads Kiilerich test-merge-tools