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

Advertisements

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s