1 <?xml version="1.0" encoding="UTF-8"?>
\r
2 <!DOCTYPE preface SYSTEM "../../dtd/dblite.dtd">
\r
3 <preface id="tme-preface" xmlns:xi="http://www.w3.org/2001/XInclude">
\r
4 <title>Preface</title>
\r
6 <graphic srccredit="TortoiseGitMerge Logo" fileref="images/tortoisemerge_logo_hor468x64.png"/>
\r
10 When working on a project, either an open-source project where
\r
11 several people review your code, or a commercial
\r
12 project where you sell a component with your source code, there will
\r
13 be people and customers who find bugs or want to improve your
\r
14 project. To do that they send you patches which you have to review
\r
15 and decide if you want to apply them.
\r
18 TortoiseGitMerge helps you with both those tasks:
\r
27 Applying the patches
\r
33 TortoiseGitMerge also helps you to sort out conflicted files which can
\r
34 occur if you're working with a source control system and others
\r
35 are working on the same files as you.
\r
38 <!-- ================================================================= -->
\r
39 <!-- ======================== SECTION 1 ============================ -->
\r
40 <!-- ================================================================= -->
\r
41 <sect1 id="tme-preface-source">
\r
42 <title>TortoiseGitMerge is free!</title>
\r
44 TortoiseGitMerge is free. You don't have to pay for it, you can use it
\r
45 any way you want. It is developed under the GP license (GPL).
\r
48 TortoiseGitMerge is an Open Source project. That means you have full
\r
49 read access to the source code of this program. You can browse it
\r
51 <ulink url="https://code.google.com/p/tortoisegit/source/browse/">
\r
52 <citetitle>https://code.google.com/p/tortoisegit/source/browse/</citetitle>
\r
55 <xi:include href="../wishlist.xml"/>
\r
57 <!-- ================================================================= -->
\r
58 <!-- ======================== SECTION 2 ============================ -->
\r
59 <!-- ================================================================= -->
\r
60 <sect1 id="tme-preface-acknowledgements">
\r
61 <title>Acknowledgments</title>
\r
63 TortoiseGitMerge is a port of TortoiseMerge (from TortoiseSVN project).
\r
73 for the hard work on TortoiseMerge
\r
83 for the beautiful icons, logo, bug hunting and
\r
84 taking care of the documentation
\r
90 Frank Li and Sven Strickroth
\r
94 for the porting TortoiseMerge to TortoiseGitMerge, the (Tortoise)Git version.
\r
100 The Tigris Style project
\r
104 for some of the styles which are reused in this
\r
115 for the patches, bug reports and new ideas, and for
\r
116 helping others by answering questions on our mailing list.
\r
126 for many hours of joy with the music they sent us
\r
132 <graphic srccredit="hide" fileref="images/background.png" />
\r