diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-07 19:10:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-07 19:10:16 (GMT) |
| commit | c19923add0530567ff90e4c4e1bccbc5c0a837f7 (patch) | |
| tree | 177bec12bc3f2be01f744981eb63daebd1ac915a /builtin-merge-file.c | |
| parent | df4364a42981dec067dbacfd6371d4ca910df48e (diff) | |
| parent | 748aa689bac2c1dd5d902815b0dec6364d20bf34 (diff) | |
| download | git-c19923add0530567ff90e4c4e1bccbc5c0a837f7.zip git-c19923add0530567ff90e4c4e1bccbc5c0a837f7.tar.gz git-c19923add0530567ff90e4c4e1bccbc5c0a837f7.tar.bz2 | |
Merge branch 'tr/add-p-single'
* tr/add-p-single:
add -p: import Term::ReadKey with 'require'
add -p: print errors in separate color
add -p: prompt for single characters
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions