mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-12 07:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

cli: use same color for timestamps in operation log as in commit log

Browse source
This commit is contained in:
Martin von Zweigbergk 2021-11-07 21:02:32 -08:00
parent 27107637f2
commit 9375106a05
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -62,8 +62,8 @@ Features:
an earlier repo state, or to simply undo a particular operation (which does
not necessarily have to be the most recent operation).
<a href="https://asciinema.org/a/dRLTHshPSPtKq5I8F7ZS06XsP" target="_blank">
<img src="https://asciinema.org/a/dRLTHshPSPtKq5I8F7ZS06XsP.svg" />
<a href="https://asciinema.org/a/OFOTcm2XlZ09LLEI5bHYM8Alw" target="_blank">
<img src="https://asciinema.org/a/OFOTcm2XlZ09LLEI5bHYM8Alw.svg" />
</a>
* **Conflicts can be recorded in commits**

4
src/formatter.rs
View file

@ -168,7 +168,7 @@ fn config_colors(user_settings: &UserSettings) -> HashMap<String, String> {
result.insert(String::from("op-log id"), String::from("blue"));
result.insert(String::from("op-log user"), String::from("yellow"));
result.insert(String::from("op-log time"), String::from("magenta"));
result.insert(String::from("op-log time"), String::from("cyan"));
result.insert(String::from("op-log tags"), String::from("white"));
result.insert(String::from("op-log head id"), String::from("bright blue"));
@ -178,7 +178,7 @@ fn config_colors(user_settings: &UserSettings) -> HashMap<String, String> {
);
result.insert(
String::from("op-log head time"),
String::from("bright magenta"),
String::from("bright cyan"),
);
result.insert(
String::from("op-log head description"),