Gentoo Archives: gentoo-scm

From: Caleb Cushing <xenoterracide@×××××.com>
To: gentoo-scm@l.g.o
Subject: [gentoo-scm] git mergetool patch (for skipping and aborting)
Date: Sun, 12 Apr 2009 17:03:10
I thought I'd share this with the gentoo-scm list just in case someone
is interested. It was rejected by the git list due to mergetool
needing refactoring. basically I have to clean up temporary files I
shouldn't have to clean up and that was going to require me to
refactor more of mergetool than I understood. I created the patch to
skip merging manifests or abort out when there were nothing left but
manifests to merge. but it'll work for anything. the patch doesn't
break any current functionality. (this version only works for 1.6.2*)

Caleb Cushing


File name MIME type
20090304-git-1.6.2-mergetool-merge-skip-abort-at-prompt.patch application/octet-stream