diff options
| author |  Duy Nguyen <pclouds@gmail.com> | 2016-01-21 18:48:44 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-01-21 10:45:13 -0800 |
| commit | a97262c62f1a31fcc7edf7629d313058bc7d66b5 (patch) | |
| tree | 96f459828c6adbb05998b7fca180fef22bf41a7f /git-merge-resolve.sh | |
| parent | diff-no-index: do not take a redundant prefix argument (diff) | |
| download | tgif-a97262c62f1a31fcc7edf7629d313058bc7d66b5.tar.xz | |
diff: make -O and --output work in subdirectory
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions