MeldMerge, Tortoise git

Looking for the commands to setup meldmerge for diff and 3-way merge, here is my current setup.

Path/DiffCommand: C:\Program Files (x86)\Meld\Meld.exe
Diff Arguments: "$LOCAL" "$BASE"
Merge Arguments: "$LOCAL" "$BASE" "$REMOTE" --auto-merge --output="$MERGED"

Kommentarer

Send en kommentar

Populære opslag fra denne blog

Recovering from Btrfs no space left on device

Btrfs is a great filesystem, distribution across disks is very usefull. I have been using it sinse it became available in Ubuntu, and have had once too many times where the disk got full, and getting out of that is very difficult. First a recommendation that lets you get of out the situation if it happens to you. Btrfs have a concept called "Device slack". Thats the space not used at the end of the Partition. Usually it's whatever can not be allocated into a block, but it can be adjusted so more space is left. Run: "btrfs device usage DEVID" and identify the device slack for each device that is part of your filesystem. They each have an ID. Then shrink the allocatable space for Btrfs thus increasing the device slack. btrfs filesystem resize 1:-10G DEVID This increases the device slack with 10GB. You probably just need space for minimum two blocks, i chose 10GB to be on the safe side. When you run out of space the next time you can then decrease the device slack ...
Læs mere

TexStudio Dansk ordbog

Dansk ordbog: http://extensions.openoffice.org/en/project/danish-spellcheck-and-hyphenation-dictionaries Download filen og åbn som en zip fil. F.eks 7z kan gøre dette. Filerne: "da_DK.aff, da_DK.dic". Skal kopieres til: C:\Program Files (x86)\TeXstudio\dictionaries Synonym ordbog: http://extensions.openoffice.org/en/project/danske-synonymer Download filen og åbn som en zip fil. F.eks 7z kan gøre dette. Filerne: "th_da_DK.dat". Skal kopieres til: C:\Program Files (x86)\TeXstudio\dictionaries
Læs mere