Tag Archives: Qemu git

Git mergetool

Wow, just rebased qemu local repo, ran into a lot of conflicts, could not make head or tail of the merge stats till help came along and pointed me to

git mergetool

This launches a external diff tool to ease the pain of merging code.

Posted from WordPress for Windows Phone

Posted from WordPress for Windows Phone

Posted from WordPress for Windows Phone

Advertisements