Re: [PATCH 0/2 v2] Adding Beyond Compare as a merge tool

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Mon, Feb 28, 2011 at 07:52, Junio C Hamano <gitster@xxxxxxxxx> wrote:

>> Sebastian Schuberth (2):
>> Â mergetool--lib: Sort tools alphabetically for easier lookup
>> Â mergetool--lib: Add Beyond Compare 3 as a tool
>>
>> ÂDocumentation/git-difftool.txt     |  Â4 +-
>> ÂDocumentation/git-mergetool.txt    Â|  Â4 +-
>> ÂDocumentation/merge-config.txt     |  Â8 +-
>> Âcontrib/completion/git-completion.bash | Â Â2 +-
>> Âgit-gui/lib/mergetool.tcl       Â| Â101 +++++++------
>> Âgit-mergetool--lib.sh         Â| Â247 +++++++++++++++++---------------
>> Â6 files changed, 195 insertions(+), 171 deletions(-)
>
> Hmm, I really would have liked if you took the hint and separated git-gui
> bits into separate patches.

Sorry, I somehow thought this would not be necessary as there were no
changes to git-gui/lib/mergetool.tcl since v1, but that was a a dumb
thought. I'll separate the patches if I have incremental updates.

-- 
Sebastian Schuberth
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]