git-gui: Enable resolution of merge conflicts.
authorShawn O. Pearce <spearce@spearce.org>
Mon, 27 Nov 2006 00:45:39 +0000 (19:45 -0500)
committerShawn O. Pearce <spearce@spearce.org>
Mon, 27 Nov 2006 05:48:49 +0000 (00:48 -0500)
commitf70c3a2...accf4f0f5abfd3d0db4120e8659dd0d7
treef72f756...78322cc4b31fd91e30b2ee45672bd6e9copy hash to clipboard (tree)
parent5e926cb...7eeb2c89e0957bed7941c2c6490767c2copy hash to clipboard (diff)
git-gui