Revision 4541,
371 bytes
checked in by yasumichi, 13 years ago
(diff) |
add interactive merge mode.
|
Line | |
---|
1 | #!/bin/sh |
---|
2 | |
---|
3 | menu1='s) º¹Ê¬¤òɽ¼¨¤¹¤ë' |
---|
4 | menu2='e) vim¤Îdiff¥â¡¼¥É¤ÇÊÔ½¸¤¹¤ë' |
---|
5 | menu3='i) sdiff¤Ë¤è¤Ã¤ÆÂÐÏÃŪ¤Ë·ë¹ç¤¹¤ë' |
---|
6 | menu4='r) ¸½ºß¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÊݸ¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ÇÃÖ¤´¹¤¨¤ë' |
---|
7 | menu5='p) ¸½ºß¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÊݸ¡¢Êݸ¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤òºï½ü¤¹¤ë' |
---|
8 | menu6='n) ¼¡¤Î¥Õ¥¡¥¤¥ë¤Ø' |
---|
9 | quest='¤É¤¦¤·¤Þ¤¹¤«? > ' |
---|
10 | detect_msg='¤¬Êݸ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£' |
---|
11 | wrong_msg="¸í¤Ã¤¿Ê¸»ú¤¬ÆþÎϤµ¤ì¤Þ¤·¤¿¡£" |
---|
Note: See
TracBrowser
for help on using the repository browser.