[PATCH 0/7] Allow custom merge strategies · Miklos Vajna <hidden> · 2016-06-15
[PATCH 1/7] Make is_git_command() usable outside builtin-help · Miklos Vajna <hidden> · 2016-06-15
[PATCH] t7601: extend the 'merge picks up the best result' test · Miklos Vajna <hidden> · 2016-06-15
[PATCH 2/7] builtin-help: change the current directory back in list_commands_in_dir() · Miklos Vajna <hidden> · 2016-06-15
[PATCH 3/7] builtin-help: make list_commands() a bit more generic · Miklos Vajna <hidden> · 2016-06-15
[PATCH 4/7] builtin-merge: allow using a custom strategy · Miklos Vajna <hidden> · 2016-06-15
[PATCH 5/7] Add a new test for using a custom merge strategy · Miklos Vajna <hidden> · 2016-06-15
[PATCH 6/7] builtin-help: make it possible to exclude some commands in list_commands() · Miklos Vajna <hidden> · 2016-06-15
[PATCH 7/7] builtin-merge: avoid non-strategy git-merge commands in error message · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH 7/7] builtin-merge: avoid non-strategy git-merge commands in error message · Johannes Schindelin <hidden> · 2016-06-15
Re: [PATCH 7/7] builtin-merge: avoid non-strategy git-merge commands in error message · Miklos Vajna <hidden> · 2016-06-15
[PATCH 7/7] builtin-merge: avoid non-strategy git-merge commands in error message · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH 7/7] builtin-merge: avoid non-strategy git-merge commands in error message · Johannes Schindelin <hidden> · 2016-06-15
Re: [PATCH 7/7] builtin-merge: avoid non-strategy git-merge commands in error message · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH 7/7] builtin-merge: avoid non-strategy git-merge commands in error message · Johannes Schindelin <hidden> · 2016-06-15
[PATCH] builtin-merge: avoid non-strategy git-merge commands in error message · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH 3/7] builtin-help: make list_commands() a bit more generic · Jonathan Nieder <hidden> · 2016-06-15
[PATCH 3/7] builtin-help: make list_commands() a bit more generic · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH 2/7] builtin-help: change the current directory back in list_commands_in_dir() · Johannes Schindelin <hidden> · 2016-06-15
Re: [PATCH] t7601: extend the 'merge picks up the best result' test · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH 1/7] Make is_git_command() usable outside builtin-help · Jonathan Nieder <hidden> · 2016-06-15
Re: [PATCH 1/7] Make is_git_command() usable outside builtin-help · Miklos Vajna <hidden> · 2016-06-15
[PATCH 0/6] Allow custom merge strategies, take 2 · Miklos Vajna <hidden> · 2016-06-15
[PATCH 1/6] builtin-help: make is_git_command() usable outside builtin-help · Miklos Vajna <hidden> · 2016-06-15
[PATCH 2/6] builtin-help: make list_commands() a bit more generic · Miklos Vajna <hidden> · 2016-06-15
[PATCH 3/6] builtin-help: make it possible to exclude some commands in list_commands() · Miklos Vajna <hidden> · 2016-06-15
[PATCH 4/6] builtin-merge: allow using a custom strategy · Miklos Vajna <hidden> · 2016-06-15
[PATCH 5/6] builtin-merge: avoid non-strategy git-merge commands in error message · Miklos Vajna <hidden> · 2016-06-15
[PATCH 6/6] Add a new test for using a custom merge strategy · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH 6/6] Add a new test for using a custom merge strategy · Johannes Schindelin <hidden> · 2016-06-15
[PATCH 6/6] Add a new test for using a custom merge strategy · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH 6/6] Add a new test for using a custom merge strategy · Johannes Schindelin <hidden> · 2016-06-15
Re: [PATCH 6/6] Add a new test for using a custom merge strategy · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH 6/6] Add a new test for using a custom merge strategy · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH 5/6] builtin-merge: avoid non-strategy git-merge commands in error message · Johannes Schindelin <hidden> · 2016-06-15
[PATCH] builtin-merge: allow using a custom strategy · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH] builtin-merge: allow using a custom strategy · Johannes Schindelin <hidden> · 2016-06-15
[PATCH 0/5] Allow custom merge strategies, take 3 · Miklos Vajna <hidden> · 2016-06-15
[PATCH 1/5] builtin-help: make is_git_command() usable outside builtin-help · Miklos Vajna <hidden> · 2016-06-15
[PATCH 2/5] builtin-help: make list_commands() a bit more generic · Miklos Vajna <hidden> · 2016-06-15
[PATCH 3/5] builtin-help: make it possible to exclude some commands in list_commands() · Miklos Vajna <hidden> · 2016-06-15
[PATCH 4/5] builtin-merge: allow using a custom strategy · Miklos Vajna <hidden> · 2016-06-15
[PATCH 5/5] Add a new test for using a custom merge strategy · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH 4/5] builtin-merge: allow using a custom strategy · Junio C Hamano <hidden> · 2016-06-15
[PATCH 0/4] Allow custom merge strategies, take 4 · Miklos Vajna <hidden> · 2016-06-15
[PATCH 1/4] builtin-help: make some internal functions available to other builtins · Miklos Vajna <hidden> · 2016-06-15
[PATCH 2/4] builtin-merge: allow using a custom strategy · Miklos Vajna <hidden> · 2016-06-15
[PATCH 3/4] Add a new test for using a custom merge strategy · Miklos Vajna <hidden> · 2016-06-15
[PATCH 4/4] Add a second testcase for handling invalid strategies in git-merge · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH 3/4] Add a new test for using a custom merge strategy · Junio C Hamano <hidden> · 2016-06-15
Re: [PATCH 3/4] Add a new test for using a custom merge strategy · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH 3/5] builtin-help: make it possible to exclude some commands in list_commands() · Junio C Hamano <hidden> · 2016-06-15
[PATCH 3/5] builtin-help: make it possible to exclude some commands in list_commands() · Miklos Vajna <hidden> · 2016-06-15

Re: [PATCH 6/6] Add a new test for using a custom merge strategy

From: Miklos Vajna <hidden>
Date: 2016-06-15 22:45:04

On Tue, Jul 29, 2008 at 01:54:17AM +0200, Johannes Schindelin [off-list ref] wrote:

Actually, this _is_ the opposite of -s ours, no?  -s ours just takes our 
tree, your -s theirs just takes their tree.

Sorry for the confusion I caused,

Aah. :-)

I did not read the source of git-merge-ours and based on your
description I thought my knowledge / the doc about -s ours was not
correct.

So I guess my original patch was right, then.

Note to self: "take 2" gets messy, time to send a "take 3" soon. ;-)

Attachments

(unnamed) [application/pgp-signature] 197 bytes

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help