Home » Mailing list archives » git » 2008 » July » 28

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

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Johannes Schindelin
Subject: Re: [PATCH 6/6] Add a new test for using a custom merge strategy
Date: Monday, July 28, 2008 - 4:54 pm

[Empty message]
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 0/7] Allow custom merge strategies, Miklos Vajna, (Sat Jul 26, 4:54 am)
[PATCH 1/7] Make is_git_command() usable outside builtin-help, Miklos Vajna, (Sat Jul 26, 4:54 am)
[PATCH] t7601: extend the 'merge picks up the best result' ..., Miklos Vajna, (Sat Jul 26, 4:54 am)
[PATCH 2/7] builtin-help: change the current directory bac ..., Miklos Vajna, (Sat Jul 26, 4:54 am)
[PATCH 3/7] builtin-help: make list_commands() a bit more ..., Miklos Vajna, (Sat Jul 26, 4:54 am)
[PATCH 4/7] builtin-merge: allow using a custom strategy, Miklos Vajna, (Sat Jul 26, 4:54 am)
[PATCH 5/7] Add a new test for using a custom merge strategy, Miklos Vajna, (Sat Jul 26, 4:54 am)
[PATCH 6/7] builtin-help: make it possible to exclude some ..., Miklos Vajna, (Sat Jul 26, 4:54 am)
[PATCH 7/7] builtin-merge: avoid non-strategy git-merge co ..., Miklos Vajna, (Sat Jul 26, 4:54 am)
Re: [PATCH] t7601: extend the 'merge picks up the best res ..., Miklos Vajna, (Sat Jul 26, 5:33 am)
Re: [PATCH 2/7] builtin-help: change the current directory ..., Johannes Schindelin, (Sat Jul 26, 7:58 am)
Re: [PATCH 7/7] builtin-merge: avoid non-strategy git-merg ..., Johannes Schindelin, (Sat Jul 26, 8:08 am)
Re: [PATCH 7/7] builtin-merge: avoid non-strategy git-merg ..., Miklos Vajna, (Sat Jul 26, 8:25 am)
[PATCH 7/7] builtin-merge: avoid non-strategy git-merge co ..., Miklos Vajna, (Sat Jul 26, 8:27 am)
Re: [PATCH 7/7] builtin-merge: avoid non-strategy git-merg ..., Johannes Schindelin, (Sat Jul 26, 8:38 am)
Re: [PATCH 7/7] builtin-merge: avoid non-strategy git-merg ..., Miklos Vajna, (Sat Jul 26, 9:00 am)
Re: [PATCH 7/7] builtin-merge: avoid non-strategy git-merg ..., Johannes Schindelin, (Sat Jul 26, 10:01 am)
[PATCH] builtin-merge: avoid non-strategy git-merge comman ..., Miklos Vajna, (Sat Jul 26, 10:12 am)
Re: [PATCH 1/7] Make is_git_command() usable outside built ..., Jonathan Nieder, (Sat Jul 26, 11:12 am)
Re: [PATCH 3/7] builtin-help: make list_commands() a bit m ..., Jonathan Nieder, (Sat Jul 26, 11:28 am)
[PATCH 3/7] builtin-help: make list_commands() a bit more ..., Miklos Vajna, (Sat Jul 26, 2:40 pm)
Re: [PATCH 2/7] builtin-help: change the current directory ..., Junio C Hamano, (Sun Jul 27, 1:02 pm)
Re: [PATCH 2/7] builtin-help: change the current directory ..., Johannes Schindelin, (Sun Jul 27, 1:21 pm)
[PATCH] Avoid chdir() in list_commands_in_dir(), Johannes Schindelin, (Sun Jul 27, 1:34 pm)
Re: [PATCH 1/7] Make is_git_command() usable outside built ..., Miklos Vajna, (Sun Jul 27, 6:18 pm)
[PATCH 0/6] Allow custom merge strategies, take 2, Miklos Vajna, (Sun Jul 27, 6:21 pm)
[PATCH 1/6] builtin-help: make is_git_command() usable out ..., Miklos Vajna, (Sun Jul 27, 6:21 pm)
[PATCH 2/6] builtin-help: make list_commands() a bit more ..., Miklos Vajna, (Sun Jul 27, 6:21 pm)
[PATCH 3/6] builtin-help: make it possible to exclude some ..., Miklos Vajna, (Sun Jul 27, 6:21 pm)
[PATCH 4/6] builtin-merge: allow using a custom strategy, Miklos Vajna, (Sun Jul 27, 6:21 pm)
[PATCH 5/6] builtin-merge: avoid non-strategy git-merge co ..., Miklos Vajna, (Sun Jul 27, 6:21 pm)
[PATCH 6/6] Add a new test for using a custom merge strategy, Miklos Vajna, (Sun Jul 27, 6:21 pm)
Re: [PATCH 3/6] builtin-help: make it possible to exclude ..., Junio C Hamano, (Sun Jul 27, 6:36 pm)
Re: [PATCH 3/6] builtin-help: make it possible to exclude ..., Johannes Schindelin, (Sun Jul 27, 7:43 pm)
Re: [PATCH 3/6] builtin-help: make it possible to exclude ..., Junio C Hamano, (Sun Jul 27, 8:05 pm)
Re: [PATCH 3/6] builtin-help: make it possible to exclude ..., Junio C Hamano, (Sun Jul 27, 9:29 pm)
Re: [PATCH 3/6] builtin-help: make it possible to exclude ..., Johannes Schindelin, (Mon Jul 28, 2:58 am)
Re: [PATCH 5/6] builtin-merge: avoid non-strategy git-merg ..., Johannes Schindelin, (Mon Jul 28, 6:06 am)
Re: [PATCH 6/6] Add a new test for using a custom merge st ..., Johannes Schindelin, (Mon Jul 28, 6:12 am)
[PATCH 3/6] builtin-help: make it possible to exclude some ..., Miklos Vajna, (Mon Jul 28, 4:24 pm)
[PATCH 6/6] Add a new test for using a custom merge strategy, Miklos Vajna, (Mon Jul 28, 4:39 pm)
[PATCH] builtin-merge: allow using a custom strategy, Miklos Vajna, (Mon Jul 28, 4:48 pm)
Re: [PATCH 6/6] Add a new test for using a custom merge st ..., Johannes Schindelin, (Mon Jul 28, 4:54 pm)
Re: [PATCH 6/6] Add a new test for using a custom merge st ..., Miklos Vajna, (Mon Jul 28, 4:58 pm)
Re: [PATCH] builtin-merge: allow using a custom strategy, Johannes Schindelin, (Mon Jul 28, 4:59 pm)
Re: [PATCH 6/6] Add a new test for using a custom merge st ..., Miklos Vajna, (Mon Jul 28, 5:01 pm)
[PATCH 0/5] Allow custom merge strategies, take 3, Miklos Vajna, (Tue Jul 29, 8:24 am)
[PATCH 1/5] builtin-help: make is_git_command() usable out ..., Miklos Vajna, (Tue Jul 29, 8:24 am)
[PATCH 2/5] builtin-help: make list_commands() a bit more ..., Miklos Vajna, (Tue Jul 29, 8:25 am)
[PATCH 3/5] builtin-help: make it possible to exclude some ..., Miklos Vajna, (Tue Jul 29, 8:25 am)
[PATCH 4/5] builtin-merge: allow using a custom strategy, Miklos Vajna, (Tue Jul 29, 8:25 am)