[Show "Revision History"] [Show "General Page Infos"] [Show "Page hits and edits"]

Revision History

Showing page edit history entries from 1 to 92 out of 92 entries total. (5 | 10 | 25 | 50 | 100 | 200 items per page)

# Date Size Editor Comment Action
92 2012-11-11 12:52:17 0 to previous abuehl executing proposed deletion view
91 2012-06-22 10:08:26 7078 to previous PeterToft   view
90 2012-05-08 16:22:50 7080 to previous mpm   view
89 2012-05-08 16:22:37 7077 to previous mpm   view
88 2012-05-04 13:25:03 7053 to previous PedroLarroy Put a correct usage of meld to 3-way merge view
87 2012-03-03 00:50:27 6749 to previous GonzaloSainzTrapaga Added link to new page on merging Gettext view
86 2012-01-12 10:17:49 6653 to previous Aleksandrs Gumenuks   view
85 2011-11-20 22:26:04 6534 to previous RomanEvstifeev Qt is not QT view
84 2011-05-20 19:42:12 6534 to previous Brad Laner   view
83 2011-05-20 19:31:21 6394 to previous Brad Laner   view
82 2011-04-10 07:21:53 6395 to previous JasonHarris Split the merging tools into sections for linux, windows, and mac since these sections differ significantly. view
81 2011-04-10 06:18:48 4446 to previous JasonHarris Those programs are not really sorted by relevance with respect to the mac platform. Ie kdiff3 is horrible on the mac. Also add araxis merge view
80 2010-07-31 05:19:57 4353 to previous MichaelErnst Clarify descriptions for Emacs and merge-tools view
79 2009-09-18 23:01:21 4267 to previous jduell The vim "DirDiff" plugin is useful for extdiff, but not merged. Vim's diff mode should be used for merges view
78 2009-05-19 19:30:56 4265 to previous localhost converted to 1.6 markup view
77 2009-02-16 20:17:26 4239 to previous AlexanderSolovyov mentioning p4merge view
76 2008-12-03 08:43:50 4167 to previous StefanRusek   view
75 2008-11-27 17:44:18 4341 to previous MadsKiilerich Add WinMerge page view
74 2008-09-22 09:13:23 4365 to previous BenoitAllard gPyFm is cross platform view
73 2008-09-18 14:08:05 4383 to previous MadsKiilerich Update tool list, sort by "relevance" view
72 2008-09-18 01:33:56 4444 to previous MadsKiilerich Matts words about merge safety view
71 2008-09-16 14:30:56 4471 to previous MadsKiilerich Cleanup of page - moving parts of it to MacOSXFileMerge view
70 2008-09-04 16:37:01 5571 to previous JamesWalker typo view
69 2008-08-08 10:17:19 5572 to previous SimonHeimberg   view
68 2008-06-09 10:06:32 5564 to previous ThomasArendsenHein "changes" is proprietary software view
67 2008-06-08 17:50:25 5563 to previous abuehl removed non-neutral attribute "decent" view
66 2008-06-08 16:11:42 5570 to previous JensKohl added Changes as a Mac OS X merging application view
65 2008-06-03 12:28:59 5461 to previous abuehl   view
64 2008-06-03 12:07:10 5461 to previous abuehl hgmerge was moved into separate page view
63 2008-05-14 18:04:11 14535 to previous JasonOrendorff   view
62 2008-05-14 17:46:15 13961 to previous TomBa missing "'" view
61 2008-05-14 17:36:33 13960 to previous JasonOrendorff explain how this works (though some parts I still don't understand) view
60 2008-04-13 22:42:36 12874 to previous TomBa FIleMerge with merge-tools view
59 2008-04-13 22:26:43 12411 to previous TomBa merge-tools example for kdiff3 view
58 2008-04-13 04:12:54 12278 to previous TomBa FileMerge: use pipe to cat instead of backticks view
57 2008-04-13 03:25:57 12127 to previous TomBa link to extdiff view
56 2008-03-25 14:11:47 12084 to previous abuehl fix level of FileMerge heading (seems not to belong to Windows). Renamed section view
55 2008-03-25 14:05:57 12070 to previous abuehl +toc view
54 2008-03-25 13:24:17 12019 to previous abuehl merge tool config is available in 1.0 view
53 2008-03-13 19:29:07 12019 to previous EricStewart Added configuration instructions for Mac OS X's FileMerge. view
52 2008-02-28 03:43:57 11308 to previous baxissimo Try to make it clearer how to get hgmerge working on windows view
51 2008-02-12 16:55:22 10618 to previous abuehl   view
50 2008-02-12 16:14:59 10617 to previous abuehl link to new MergeToolConfiguration page view
49 2008-01-30 02:33:45 10483 to previous IanLewis   view
48 2008-01-13 16:24:47 9567 to previous abuehl tidy links view
47 2008-01-06 23:00:26 9561 to previous baxissimo link for batteries included view
46 2008-01-06 15:55:43 9514 to previous baxissimo added note about prereq view
45 2008-01-04 16:06:29 9414 to previous abuehl +cat view
44 2007-12-04 04:55:46 9390 to previous SteveBorho update hgmerge.py docs view
43 2007-12-01 21:08:57 9457 to previous SteveBorho Update hgmerge.py description view
42 2007-10-11 19:20:24 9615 to previous busch   view
41 2007-10-07 05:46:54 9299 to previous ppp-70-246-222-153 add mention of python hgmerge.py option view
40 2007-10-07 05:08:56 8184 to previous ppp-70-246-222-153 add gpyfm view
39 2007-10-04 09:03:24 8092 to previous ErikKline spelling tweaks (and 1 space). hopefully it's more readable. view
38 2007-09-19 14:27:50 8090 to previous AntonVodonosov see here: http://selenic.com/pipermail/mercurial/2007-September/014773.html view
37 2007-09-19 11:27:08 8078 to previous AntonVodonosov problem in hdmerge for kdiff when kdiff is installed on a path with whitespace view
36 2007-09-19 11:07:15 8087 to previous AntonVodonosov   view
35 2007-08-26 06:04:45 7620 to previous PeerSommerlund Windows: Remove /b from "exit" - otherwise hg will not see failed merges view
34 2007-08-16 15:47:20 7420 to previous 63-230-120-16   view
33 2007-08-08 01:26:20 6640 to previous SpookyET   view
32 2007-08-08 01:06:23 6548 to previous adsl-160-35-173   view
31 2007-08-07 13:52:51 4557 to previous adsl-160-35-173   view
30 2007-07-23 07:21:59 4434 to previous PeerSommerlund Add WinMerge example view
29 2007-07-14 02:46:06 3815 to previous CPE-24-208-26-25 grammer fix, "marker conflicts"=>"conflict markers" view
28 2007-06-12 05:32:39 3815 to previous pool-71-255-136-67 Add Vim DirDiff link. view
27 2007-06-12 04:08:36 3724 to previous Filenet-gw   view
26 2007-06-06 12:41:33 3706 to previous DirkjanOchtman Add link to new merge tool. view
25 2007-06-06 10:06:07 3601 to previous LSt-Amand-152-32-48-227   view
24 2007-04-18 21:35:07 3526 to previous 82-168-234-34 reverted to version 22: winmerge does not support 3-way merge view
23 2007-04-17 21:58:22 3607 to previous vau75-1-81-57-130-154 Add WinMerge view
22 2007-04-07 19:17:57 3526 to previous p5b159c5b this caused me some trouble as newbie.. view
21 2007-03-20 15:17:21 3400 to previous 82-168-234-34 modified windows batch file for kdiff3 view
20 2007-03-16 11:53:50 2971 to previous 82-168-234-34   view
19 2007-03-16 11:46:03 2972 to previous 82-168-234-34 added batch script for TortoiseMerge view
18 2007-03-16 11:14:10 2318 to previous 82-168-234-34 added TortoiseMerge item view
17 2007-01-18 15:12:25 2213 to previous 216   view
16 2007-01-03 22:56:36 2128 to previous 82-69-83-119 Trivial grammar: 'none' is singular. view
15 2006-07-03 01:24:56 2129 to previous GiorgosKeramidas Add a link to a new page about manually merging with diff3 and an editor view
14 2006-05-16 08:58:03 1989 to previous ChristianBoos Make it clear that mercurial doesn't attempt to merge files by itself view
13 2006-04-06 21:51:35 1348 to previous AlexanderSchremmer   view
12 2005-12-20 01:15:51 1109 to previous corecode xxdiff homepage has moved view
11 2005-11-17 07:00:42 1106 to previous tonfa how hgmerge is called view
10 2005-09-21 13:42:38 884 to previous DanielSantaCruz   view
9 2005-08-26 01:33:39 852 to previous waste   view
8 2005-08-26 01:31:41 853 to previous waste   view
7 2005-08-26 01:28:37 852 to previous waste   view
6 2005-08-26 01:26:30 861 to previous waste   view
5 2005-08-26 01:23:56 851 to previous waste   view
4 2005-08-26 01:22:43 871 to previous waste   view
3 2005-08-26 01:07:14 843 to previous waste   view
2 2005-08-26 01:05:18 849 to previous waste   view
1 2005-08-26 00:58:11 843 waste   view