diff options
| author |  Johan Herland <johan@herland.net> | 2010-11-09 22:49:50 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-11-17 13:22:49 -0800 |
| commit | 00f03061e27cad5497abcca2b70fa9fa04818275 (patch) | |
| tree | e80f2b3b5bb4c517e4124c2f9115cd1e66e8a95c /t/t6028-merge-up-to-date.sh | |
| parent | git notes merge: Add automatic conflict resolvers (ours, theirs, union) (diff) | |
| download | tgif-00f03061e27cad5497abcca2b70fa9fa04818275.tar.xz | |
Documentation: Preliminary docs on 'git notes merge'
This patch has been improved by the following contributions:
- Stephen Boyd: Use "automatically resolves" instead of "auto-resolves"
- Stephen Boyd: Remove unbalanced '('
Thanks-to: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6028-merge-up-to-date.sh')
0 files changed, 0 insertions, 0 deletions