← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/git-core/intrepid-updates

« back to all changes in this revision

Viewing changes to git-merge-resolve.sh

  • Committer: Package Import Robot
  • Author(s): Gerrit Pape
  • Date: 2007-04-22 13:31:05 UTC
  • mfrom: (1.1.14)
  • Revision ID: package-import@ubuntu.com-20070422133105-tkmhz328g2p0epz1
Tags: 1:1.5.1.2-1
* new upstream point release.
* debian/changelog.upstream: upstream changes taken from mailing list
  announcement.

Show diffs side-by-side

added added

removed removed

Lines of Context:
git-merge-resolve.sh
3
3
# Copyright (c) 2005 Linus Torvalds
4
4
# Copyright (c) 2005 Junio C Hamano
5
5
#
6
 
# Resolve two trees, using enhancd multi-base read-tree.
 
6
# Resolve two trees, using enhanced multi-base read-tree.
7
7
 
8
8
# The first parameters up to -- are merge bases; the rest are heads.
9
9
bases= head= remotes= sep_seen=