diff --git a/README.md b/README.md index 85b47f819..daa359479 100644 --- a/README.md +++ b/README.md @@ -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). - - + + * **Conflicts can be recorded in commits** diff --git a/src/formatter.rs b/src/formatter.rs index 4e71a18ef..9a8f9ae76 100644 --- a/src/formatter.rs +++ b/src/formatter.rs @@ -168,7 +168,7 @@ fn config_colors(user_settings: &UserSettings) -> HashMap { 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 { ); result.insert( String::from("op-log head time"), - String::from("bright magenta"), + String::from("bright cyan"), ); result.insert( String::from("op-log head description"),