diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-03-11 08:11:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-11 08:11:38 -0700 |
| commit | ca8df3df8cda05221939e7f9b00e648594e2d584 (patch) | |
| tree | c041aeb5bc2606bdfeb1a549207986a895dadb89 /resolve-undo.c | |
| parent | Merge branch 'maint' (diff) | |
| parent | add: Clarify documentation of -A and -u (diff) | |
| download | tgif-ca8df3df8cda05221939e7f9b00e648594e2d584.tar.xz | |
Merge branch 'gp/add-u-A-documentation'
* gp/add-u-A-documentation:
add: Clarify documentation of -A and -u
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions