diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-07-15 19:08:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-15 19:08:11 (GMT) |
| commit | a8b7fcffddc6bce0875775154d6a41a528340d71 (patch) | |
| tree | 7a351043d53ce60a3686cd61d035a099d0caca08 /builtin/diff.c | |
| parent | c257bbb559732ae2be07064de7a583bc24436667 (diff) | |
| parent | 5e5ffa091bc272f5034a8e3f2bf9fbb0bd79086c (diff) | |
| download | git-a8b7fcffddc6bce0875775154d6a41a528340d71.zip git-a8b7fcffddc6bce0875775154d6a41a528340d71.tar.gz git-a8b7fcffddc6bce0875775154d6a41a528340d71.tar.bz2 | |
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 'builtin/diff.c')
0 files changed, 0 insertions, 0 deletions