diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-07-30 01:17:00 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-29 23:21:36 -0700 |
| commit | 1b1d78fe77d676bb79a9272ff6f3517697811990 (patch) | |
| tree | 98f6958d8d1435b5c359b791f20d75c56c487791 /help.c | |
| parent | builtin-merge: allow using a custom strategy (diff) | |
| download | git-1b1d78fe77d676bb79a9272ff6f3517697811990.tar.gz git-1b1d78fe77d676bb79a9272ff6f3517697811990.zip | |
Add a new test for using a custom merge strategy
Testing is done by creating a simple git-merge-theirs strategy which is
the opposite of ours. Using this in real merges is not recommended but
it's perfect for our testing needs.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'help.c')
0 files changed, 0 insertions, 0 deletions