diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-07-15 12:08:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-15 12:08:11 -0700 |
| commit | a8b7fcffddc6bce0875775154d6a41a528340d71 (patch) | |
| tree | 7a351043d53ce60a3686cd61d035a099d0caca08 /resolve-undo.c | |
| parent | Merge branch 'jn/tests' (diff) | |
| parent | merge-recursive: use "up-to-date" instead of "uptodate" in error message for ... (diff) | |
| download | tgif-a8b7fcffddc6bce0875775154d6a41a528340d71.tar.xz | |
Merge branch 'ns/merge-recursive-uptodate'
* ns/merge-recursive-uptodate:
merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions