Re: [PATCH 6/8] sh-tools: add a run_merge_tool function

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Subject: Re: [PATCH 6/8] sh-tools: add a run_merge_tool function
From: Markus Heidelberg <markus.heidelberg@xxxxxx>
Date: Mon, 30 Mar 2009 08:55:09 +0200
Cc: gitster@xxxxxxxxx, git@xxxxxxxxxxxxxxx
In-reply-to: <1238389428-69328-7-git-send-email-davvid@xxxxxxxxx>
Jabber-id: markus.heidelberg@xxxxxx
Reply-to: markus.heidelberg@xxxxxx
User-agent: KMail/1.9.9

David Aguilar, 30.03.2009:
> +		if mergetool_mode; then
> +			base=Baes

Base

> +			local=Local
> +			remote=Remote
> +		else

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

References:
- [no subject]
  - From: David Aguilar
- [PATCH 5/8] difftool: refactor git-difftool to use git-sh-tools
  - From: David Aguilar
- [PATCH 6/8] sh-tools: add a run_merge_tool function
  - From: David Aguilar

Prev by Date: Re: [PATCH] git-gui: make "Git GUI Here" Explorer extension more robust
Next by Date: Re: [PATCH 1/2] Add feature release instructions to MaintNotes addendum
Previous by thread: [PATCH 8/8] difftool: refactor git-difftool-helper to use run_merge_tool
Next by thread: Re: [PATCH 6/8] sh-tools: add a run_merge_tool function
Index(es):
- Date
- Thread

[Index of Archives] [Linux Kernel Development] [Gcc Help] [IETF Annouce] [DCCP] [Netdev] [Networking] [Security] [V4L] [Bugtraq] [Yosemite] [MIPS Linux] [ARM Linux] [Linux Security] [Linux RAID] [Linux SCSI] [Fedora Users]

Powered by Linux