跳至主要内容

Use MobaDiff with git difftool

Recently there's an activity in IT that forces the deletion of all
unauthorized softwares from all work machines.

Unfortunately, kdiff3 is one in the list.

As it is generally okay to use vimdiff as an alternative for kdiff3, A
gui tool is better suited for desktop workflows.

Known that MobaXterm is shipping a gui diff tool named MobaDiff. But
it only appears in the windows right click context menu.

Find the real application name takes me some time to search in the
windows registry. "MobaRTE.exe", which is the one invoked by
HKCR\*\shell\MobaDiff. And it was invoked with "-contextdiff" switch
to show MobaDiff UI, while when the switch is "-contextedit" it shows
MobaTextEditor.

Too bad that the "-contextdiff" switch do not support pre-image
post-image as other diff tool did, which effectively made it unable to
be used as a command line diff utility.

Also MobaTech did not mention anything in their document of this
MobaRTE application.

Finding the correct parameter and switches to invoke it as an ordinary
diff utility takes me lots of time. In the MobaXterm document, it was
said "MobaXterm.exe" will accept the "-compfiles" parameter which will
invoke the MobaDiff interface. But it does not work in my system,
actually MobaXterm.exe when invoked with -compfiles parameter will
hang there showing a splash banner only. I have to use Ctrl-C in the
terminal to stop it.

The good thing is, "MobaRTE" accepts the "-compfiles" switch also, and
it accepts those pre-image and post-image filenames parameters.

Now it works like a diff utility. And here's my setup:

```
git config --global diff.guitool moba
git config --global difftool.moba.cmd '"C:\Program Files
(x86)\Mobatek\MobaXterm\MobaRTE" -compfiles $LOCAL $REMOTE'
```

评论

此博客中的热门博文

Eglot and before/after-save-hook and use-package

In Emacs, when you try to automate some actions during every save action, you will surely get to the before-save-hook and the after-save-hook. Simply adding something like gofmt-before-save to before-save-hook will save you tons of time to do the go-fmt. And then, I meet eglot, and gopls will also save me tons of time doing googling and api documentation navigation. But eglot-ensure is not very friendly to the good old ways of how after-save-hooks were designed to work. It makes the before/after-save-hook a buffer local variable and it does not inherit the variable's global value. So, to make before/after-save-hook work again, experts start to adding hooks to major mode specific hooks like this: emacs.md - Go (opensource.google) """ ;; Optional: install eglot-format-buffer as a save hook. ;; The depth of -10 places this before eglot's willSave notification, ;; so that that notification reports the actual contents that will be saved. (defu...

XEmacs 21.5 beta 35 "kohlrabi" has been released.

If you are an old XEmacs user, you may feel happy to see this from https://www.xemacs.org/.    After ten years, XEmacs released a new version 21.5. So there's still many people cares about XEmacs. The XEmacs' source repo have been moved from altassian Bitbucket to https://heptapod.net/. As Bitbucket have been dropped Mercurial support many years ago.