summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorLibravatar Tuomas Suutari <tuomas.suutari@gmail.com>2010-02-22 20:12:53 +0200
committerLibravatar Eric Wong <normalperson@yhbt.net>2010-02-26 01:30:23 -0800
commit6a2009e7f34148a737d8832887dcd491905017be (patch)
tree843d8292cd9b077ebaf890c30a654561b88f024b /Documentation/git-mergetool--lib.txt
parentt9151: Add two new svn:mergeinfo test cases (diff)
downloadtgif-6a2009e7f34148a737d8832887dcd491905017be.tar.xz
git-svn: Fix discarding of extra parents from svn:mergeinfo
If parent J is an ancestor of parent I, then parent J should be discarded, not I. Note that J is an ancestor of I if and only if rev-list I..J is emtpy, which is what we are testing here. Signed-off-by: Tuomas Suutari <tuomas.suutari@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions