summaryrefslogtreecommitdiff
path: root/t/t4100/t-apply-6.patch
diff options
context:
space:
mode:
authorLibravatar Alex Vandiver <alex@chmrr.net>2009-11-29 02:20:21 -0500
committerLibravatar Eric Wong <normalperson@yhbt.net>2009-12-07 20:25:40 -0800
commite9e4c8b7473f6ee21f452c66430a0763681243d7 (patch)
treeafe4839ee21aaaa7cf91d1446f6908480e93a2b2 /t/t4100/t-apply-6.patch
parentbash: update 'git commit' completion (diff)
downloadtgif-e9e4c8b7473f6ee21f452c66430a0763681243d7.tar.xz
git-svn: sort svk merge tickets to account for minimal parents
When merging branches based on svk:merge properties, a single merge can have updated or added multiple svk:merge lines. Attempt to include the minimal set of parents by sorting the merge properties in order of revision, highest to lowest. Signed-off-by: Alex Vandiver <alex@chmrr.net> Acked-by: Sam Vilain <sam@vilain.net> Acked-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 't/t4100/t-apply-6.patch')
0 files changed, 0 insertions, 0 deletions